From f966410e1179ff675b5fbe94cba9ef12044c1ac1 Mon Sep 17 00:00:00 2001
From: Eric Fode <eric.fode@autodesk.com>
Date: Thu, 20 Nov 2014 11:13:00 -0800
Subject: [PATCH 1/3] testing change to move the logic for establishing the
 defualt user to be used for consul

---
 attributes/default.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/attributes/default.rb b/attributes/default.rb
index 6a42d6ee..bf02fd35 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -60,8 +60,16 @@
 
 default['consul']['servers'] = []
 default['consul']['init_style'] = 'init'   # 'init', 'runit'
-default['consul']['service_user'] = 'consul'
-default['consul']['service_group'] = 'consul'
+
+case node['consul']['init_style'] 
+when 'runit'
+  default['consul']['service_user'] = 'consul'
+  default['consul']['service_group'] = 'consul'
+else
+  default['consul']['service_user'] = 'root'
+  default['consul']['service_group'] = 'root'
+end
+
 default['consul']['ports'] = {
   'dns'      => 8600,
   'http'     => 8500,

From f5640a55764f25e77b9c21c0003f919117b02956 Mon Sep 17 00:00:00 2001
From: Eric Fode <eric.fode@autodesk.com>
Date: Thu, 20 Nov 2014 12:03:33 -0800
Subject: [PATCH 2/3] removed newly redundent logic in recipe

---
 recipes/_service.rb | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/recipes/_service.rb b/recipes/_service.rb
index 62f9fbb3..b8d75288 100644
--- a/recipes/_service.rb
+++ b/recipes/_service.rb
@@ -24,16 +24,9 @@
 consul_directories << '/var/lib/consul'
 
 # Select service user & group
-case node['consul']['init_style']
-when 'runit'
+if node['consul']['init_style'] == 'runit'
   include_recipe 'runit::default'
-
-  consul_user = node['consul']['service_user']
-  consul_group = node['consul']['service_group']
   consul_directories << '/var/log/consul'
-else
-  consul_user = 'root'
-  consul_group = 'root'
 end
 
 # Create service user

From b3105938d97787bfeda7ac07e678953d7a0f22f0 Mon Sep 17 00:00:00 2001
From: Eric Fode <eric.fode@autodesk.com>
Date: Thu, 20 Nov 2014 14:01:36 -0800
Subject: [PATCH 3/3] deleted a little to much

---
 recipes/_service.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes/_service.rb b/recipes/_service.rb
index b8d75288..59f7e233 100644
--- a/recipes/_service.rb
+++ b/recipes/_service.rb
@@ -29,6 +29,9 @@
   consul_directories << '/var/log/consul'
 end
 
+consul_user  = node['consul']['service_user']
+consul_group = node['consul']['service_group']
+
 # Create service user
 user "consul service user: #{consul_user}" do
   not_if { consul_user == 'root' }