Merge pull request #26 from jubianchi/consul-ports

Add attributes to configure Consul ports
sous-chefs · Nov 15, 2014 · 92a11df · 92a11df
2 parents 3643ab6 + 0274688
commit 92a11df
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -60,6 +60,14 @@
 default['consul']['init_style'] = 'init'   # 'init', 'runit'
 default['consul']['service_user'] = 'consul'
 default['consul']['service_group'] = 'consul'
+default[:consul][:ports] = {
+    :dns => 8600,
+    :http => 8500,
+    :rpc => 8400,
+    :serf_lan => 8301,
+    :serf_wan => 8302,
+    :server => 8300,
+}
 
 # Optionally bind to a specific interface
 default['consul']['bind_interface'] = nil

diff --git a/recipes/_service.rb b/recipes/_service.rb
@@ -111,10 +111,14 @@
 end
 
 copy_params = [
-  :bind_addr, :datacenter, :domain, :log_level, :node_name, :advertise_addr, :enable_syslog, :encrypt
+  :bind_addr, :datacenter, :domain, :log_level, :node_name, :advertise_addr, :ports, :enable_syslog, :encrypt
 ]
 copy_params.each do |key|
   if node['consul'][key]
+    if key == :ports
+      Chef::Application.fatal! 'node[:consul][:ports] must be a Hash' unless node[:consul][key].kind_of?(Hash)
+    end
+
     service_config[key] = node['consul'][key]
   end
 end