From 8ead0aa7d94ad4c59123cde198cf86f6c7636bec Mon Sep 17 00:00:00 2001 From: mateusz Date: Sun, 9 Oct 2016 10:52:12 +0200 Subject: [PATCH 1/3] Added missing attributes --- libraries/consul_config.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/consul_config.rb b/libraries/consul_config.rb index 9fe8dc69..63da8bf9 100644 --- a/libraries/consul_config.rb +++ b/libraries/consul_config.rb @@ -68,6 +68,7 @@ class ConsulConfig < Chef::Resource attribute(:leave_on_terminate, equal_to: [true, false], default: false) attribute(:log_level, equal_to: %w(INFO DEBUG WARN), default: 'INFO') attribute(:node_name, kind_of: String) + attribute(:performance, kind_of: [Hash, Mash]) attribute(:ports, kind_of: [Hash, Mash]) attribute(:protocol, kind_of: String) attribute(:recursor, kind_of: String) @@ -79,6 +80,7 @@ class ConsulConfig < Chef::Resource attribute(:rejoin_after_leave, equal_to: [true, false], default: true) attribute(:server, equal_to: [true, false], default: true) attribute(:server_name, kind_of: String) + attribute(:session_ttl_min, kind_of: String) attribute(:skip_leave_on_interrupt, equal_to: [true, false], default: false) attribute(:start_join, kind_of: Array) attribute(:start_join_wan, kind_of: Array) @@ -99,7 +101,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 atlas_acl_token atlas_infrastructure atlas_join atlas_token atlas_endpoint 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_interval_wan retry_join retry_join_wan rejoin_after_leave server server_name skip_leave_on_interrupt start_join start_join_wan statsd_addr statsite_addr statsite_prefix telemetry syslog_facility translate_wan_addrs ui ui_dir verify_incoming verify_outgoing verify_server_hostname watches dev_mode unix_sockets} + for_keeps = %i{acl_datacenter acl_default_policy acl_down_policy acl_master_token acl_token acl_ttl addresses advertise_addr advertise_addr_wan atlas_acl_token atlas_infrastructure atlas_join atlas_token atlas_endpoint 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 performance ports protocol recursor recursors retry_interval retry_interval_wan retry_join retry_join_wan rejoin_after_leave server server_name session_ttl_min skip_leave_on_interrupt start_join start_join_wan statsd_addr statsite_addr statsite_prefix telemetry syslog_facility translate_wan_addrs ui ui_dir verify_incoming verify_outgoing verify_server_hostname watches dev_mode unix_sockets} for_keeps << %i{ca_file cert_file key_file} if tls? for_keeps = for_keeps.flatten From bc363020c8c69756525ba7057e20fead6a031c16 Mon Sep 17 00:00:00 2001 From: mateusz Date: Mon, 10 Oct 2016 20:37:13 +0200 Subject: [PATCH 2/3] Removed trailing spaces --- libraries/consul_config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/consul_config.rb b/libraries/consul_config.rb index 63da8bf9..1dcf5e1c 100644 --- a/libraries/consul_config.rb +++ b/libraries/consul_config.rb @@ -80,7 +80,7 @@ class ConsulConfig < Chef::Resource attribute(:rejoin_after_leave, equal_to: [true, false], default: true) attribute(:server, equal_to: [true, false], default: true) attribute(:server_name, kind_of: String) - attribute(:session_ttl_min, kind_of: String) + attribute(:session_ttl_min, kind_of: String) attribute(:skip_leave_on_interrupt, equal_to: [true, false], default: false) attribute(:start_join, kind_of: Array) attribute(:start_join_wan, kind_of: Array) From 8e1396f741b13af0c448b32d702b4da7f8c4573c Mon Sep 17 00:00:00 2001 From: Mikhail Zholobov Date: Mon, 10 Oct 2016 21:51:39 +0300 Subject: [PATCH 3/3] Add attributes appeared in Consul 0.7.0 --- libraries/consul_config.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libraries/consul_config.rb b/libraries/consul_config.rb index 1dcf5e1c..2f88fbdf 100644 --- a/libraries/consul_config.rb +++ b/libraries/consul_config.rb @@ -36,6 +36,7 @@ class ConsulConfig < Chef::Resource attribute(:acl_default_policy, kind_of: String) attribute(:acl_down_policy, kind_of: String) attribute(:acl_master_token, kind_of: String) + attribute(:acl_replication_token, kind_of: String) attribute(:acl_token, kind_of: String) attribute(:acl_ttl, kind_of: String) attribute(:addresses, kind_of: [Hash, Mash]) @@ -57,6 +58,7 @@ class ConsulConfig < Chef::Resource attribute(:datacenter, kind_of: String) attribute(:dev_mode, equal_to: [true, false], default: false) attribute(:disable_anonymous_signature, equal_to: [true, false], default: false) + attribute(:disable_compression, equal_to: [true, false], default: false) attribute(:disable_remote_exec, equal_to: [true, false], default: false) attribute(:disable_update_check, equal_to: [true, false], default: false) attribute(:dns_config, kind_of: [Hash, Mash]) @@ -71,7 +73,10 @@ class ConsulConfig < Chef::Resource attribute(:performance, kind_of: [Hash, Mash]) attribute(:ports, kind_of: [Hash, Mash]) attribute(:protocol, kind_of: String) + attribute(:reconnect_timeout, kind_of: String) + attribute(:reconnect_timeout_wan, kind_of: String) attribute(:recursor, kind_of: String) + attribute(:recursor_timeout, kind_of: String) attribute(:recursors, kind_of: Array) attribute(:retry_interval, kind_of: String) attribute(:retry_interval_wan, kind_of: String) @@ -90,6 +95,7 @@ class ConsulConfig < Chef::Resource attribute(:telemetry, kind_of: [Hash, Mash]) attribute(:syslog_facility, kind_of: String) attribute(:translate_wan_addrs, equal_to: [true, false], default: false) + attribute(:udp_answer_limit, kind_of: Integer, default: 3) attribute(:ui, equal_to: [true, false], default: false) attribute(:ui_dir, kind_of: String, default: '/var/lib/consul/ui') attribute(:unix_sockets, kind_of: [Hash, Mash]) @@ -101,7 +107,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 atlas_acl_token atlas_infrastructure atlas_join atlas_token atlas_endpoint 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 performance ports protocol recursor recursors retry_interval retry_interval_wan retry_join retry_join_wan rejoin_after_leave server server_name session_ttl_min skip_leave_on_interrupt start_join start_join_wan statsd_addr statsite_addr statsite_prefix telemetry syslog_facility translate_wan_addrs ui ui_dir verify_incoming verify_outgoing verify_server_hostname watches dev_mode unix_sockets} + for_keeps = %i{acl_datacenter acl_default_policy acl_down_policy acl_master_token acl_replication_token acl_token acl_ttl addresses advertise_addr advertise_addr_wan atlas_acl_token atlas_infrastructure atlas_join atlas_token atlas_endpoint bind_addr bootstrap bootstrap_expect check_update_interval client_addr data_dir datacenter disable_anonymous_signature disable_compression disable_remote_exec disable_update_check dns_config domain enable_debug enable_syslog encrypt leave_on_terminate log_level node_name performance ports protocol reconnect_timeout reconnect_timeout_wan recursor recursor_timeout recursors retry_interval retry_interval_wan retry_join retry_join_wan rejoin_after_leave server server_name session_ttl_min skip_leave_on_interrupt start_join start_join_wan statsd_addr statsite_addr statsite_prefix telemetry syslog_facility translate_wan_addrs udp_answer_limit ui ui_dir verify_incoming verify_outgoing verify_server_hostname watches dev_mode unix_sockets} for_keeps << %i{ca_file cert_file key_file} if tls? for_keeps = for_keeps.flatten