Merge pull request #361 from pdf/allow_disable_create_service_user

Allow disabling create_service_user
sous-chefs · Nov 2, 2016 · fe538b2 · fe538b2
2 parents a7e9cf4 + f58ad83
commit fe538b2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -8,6 +8,7 @@
 default['consul']['service_name'] = 'consul'
 default['consul']['service_user'] = 'consul'
 default['consul']['service_group'] = 'consul'
+default['consul']['create_service_user'] = true
 
 default['consul']['config']['owner'] = 'consul'
 default['consul']['config']['group'] = 'consul'

diff --git a/recipes/default.rb b/recipes/default.rb
@@ -39,6 +39,7 @@
   shell node['consul']['service_shell'] unless node['consul']['service_shell'].nil?
   not_if { windows? }
   not_if { node['consul']['service_user'] == 'root' }
+  not_if { node['consul']['create_service_user'] == false }
   notifies :restart, "consul_service[#{service_name}]", :delayed
 end
 

diff --git a/test/spec/recipes/default_spec.rb b/test/spec/recipes/default_spec.rb
@@ -20,4 +20,15 @@
       expect(chef_run).to_not create_poise_service_user('root')
     end
   end
+
+  context "with create_service_user disabled" do
+    before do
+      default_attributes['consul'] ||= {}
+      default_attributes['consul']['create_service_user'] = false
+    end
+
+    it 'does not try to create the user' do
+      expect(chef_run).to_not create_poise_service_user('consul')
+    end
+  end
 end