Add some additional options to the service_config hash.

sous-chefs · Nov 17, 2014 · d6aa11d · d6aa11d
1 parent 92a11df
commit d6aa11d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/metadata.rb b/metadata.rb
@@ -4,7 +4,7 @@
 license 'Apache v2.0'
 description 'Installs/Configures consul'
 long_description 'Installs/Configures consul'
-version '0.5.1'
+version '0.5.2'
 
 recipe 'consul', 'Installs and starts consul service.'
 recipe 'consul::install_binary', 'Installs consul service from binary.'

diff --git a/recipes/_service.rb b/recipes/_service.rb
@@ -110,6 +110,14 @@
   service_config['client_addr'] = node['consul']['client_addr']
 end
 
+additional_options = ['recursor', 'statsd_addr', 'leave_on_terminate', 'disable_remote_exec', 'acl_datacenter', 'acl_token', 'acl_default_policy', 'acl_down_policy', 'acl_master_token']
+
+additional_options.each do |option|
+  if node['consul'][option]
+    service_config[option] = node['consul'][option]
+  end
+end
+
 copy_params = [
   :bind_addr, :datacenter, :domain, :log_level, :node_name, :advertise_addr, :ports, :enable_syslog, :encrypt
 ]