Merge pull request #190 from joshgarnett/separate_install_from_service

Separate install from service
sous-chefs · Jul 4, 2015 · 034e33c · 034e33c
2 parents 1e1e53a + 1c11aac
commit 034e33c
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 6 deletions.
diff --git a/recipes/default.rb b/recipes/default.rb
@@ -25,3 +25,5 @@
 else
   Chef::Application.fatal!("[consul::default] unknown install method, method=#{node['consul']['install_method']}")
 end
+
+include_recipe 'consul::service'
diff --git a/recipes/install_binary.rb b/recipes/install_binary.rb
@@ -44,5 +44,3 @@
 link Chef::Consul.active_binary(node) do
   to Chef::Consul.latest_binary(node)
 end
-
-include_recipe 'consul::_service'
diff --git a/recipes/install_packages.rb b/recipes/install_packages.rb
@@ -30,5 +30,3 @@
 
 package 'consul'
 package 'consul-webui'
-
-include_recipe 'consul::_service'
diff --git a/recipes/install_source.rb b/recipes/install_source.rb
@@ -43,5 +43,3 @@
 link Chef::Consul.active_binary(node) do
   to Chef::Consul.source_binary(node)
 end
-
-include_recipe 'consul::_service'
diff --git a/recipes/_service.rb → recipes/service.rb b/recipes/_service.rb → recipes/service.rb