From 6c662b25ea3f88e3908b5df554cc4526f3917501 Mon Sep 17 00:00:00 2001
From: Joshua Garnett <jgarnett@zynga.com>
Date: Thu, 2 Jul 2015 10:31:55 -0400
Subject: [PATCH 1/2] Moving the include of _service into default, so that the
 installs can be run without actually setting up the service

---
 recipes/default.rb          | 2 ++
 recipes/install_binary.rb   | 2 --
 recipes/install_packages.rb | 2 --
 recipes/install_source.rb   | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/recipes/default.rb b/recipes/default.rb
index 05d96fbd..9e0b11aa 100644
--- 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
index 6117c149..5c244ede 100644
--- 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
index 3b5b94e4..3f5f70fa 100644
--- 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
index 8b49d293..d0fec1e2 100644
--- 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'

From 1c11aac0e142ce8f077e0984e2f3a82b6b63d4e8 Mon Sep 17 00:00:00 2001
From: Joshua Garnett <jgarnett@zynga.com>
Date: Thu, 2 Jul 2015 10:44:17 -0400
Subject: [PATCH 2/2] Making service public so it can be referenced directly

---
 recipes/default.rb                  | 2 +-
 recipes/{_service.rb => service.rb} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename recipes/{_service.rb => service.rb} (100%)

diff --git a/recipes/default.rb b/recipes/default.rb
index 9e0b11aa..6db6a311 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -26,4 +26,4 @@
   Chef::Application.fatal!("[consul::default] unknown install method, method=#{node['consul']['install_method']}")
 end
 
-include_recipe 'consul::_service'
+include_recipe 'consul::service'
diff --git a/recipes/_service.rb b/recipes/service.rb
similarity index 100%
rename from recipes/_service.rb
rename to recipes/service.rb