diff --git a/libraries/consul_config.rb b/libraries/consul_config.rb index 3c4cdf50..a4c0a2fc 100644 --- a/libraries/consul_config.rb +++ b/libraries/consul_config.rb @@ -73,6 +73,7 @@ class ConsulConfig < Chef::Resource attribute(:recursor, kind_of: String) attribute(:recursors, kind_of: Array) attribute(:retry_interval, kind_of: Integer) + attribute(:retry_join, kind_of: Array) attribute(:server, equal_to: [true, false], default: true) attribute(:server_name, kind_of: String) attribute(:skip_leave_on_interrupt, equal_to: [true, false], default: false) @@ -90,7 +91,7 @@ class ConsulConfig < Chef::Resource # Transforms the resource into a JSON format which matches the # Consul service's configuration format. def to_json - for_keeps = %i{acl_datacenter acl_default_policy acl_down_policy acl_master_token acl_token acl_ttl addresses advertise_addr advertise_addr_wan bind_addr bootstrap bootstrap_expect check_update_interval client_addr data_dir datacenter disable_anonymous_signature disable_remote_exec disable_update_check dns_config domain enable_debug enable_syslog encrypt leave_on_terminate log_level node_name ports protocol recursor recursors retry_interval server server_name skip_leave_on_interrupt start_join start_join_wan statsd_addr statsite_addr syslog_facility ui_dir verify_incoming verify_outgoing verify_server_hostname watches} + for_keeps = %i{acl_datacenter acl_default_policy acl_down_policy acl_master_token acl_token acl_ttl addresses advertise_addr advertise_addr_wan bind_addr bootstrap bootstrap_expect check_update_interval client_addr data_dir datacenter disable_anonymous_signature disable_remote_exec disable_update_check dns_config domain enable_debug enable_syslog encrypt leave_on_terminate log_level node_name ports protocol recursor recursors retry_interval retry_join server server_name skip_leave_on_interrupt start_join start_join_wan statsd_addr statsite_addr syslog_facility ui_dir verify_incoming verify_outgoing verify_server_hostname watches} for_keeps << %i{ca_file cert_file key_file} if tls? config = to_hash.keep_if do |k, _| for_keeps.include?(k.to_sym)