diff --git a/deployment/puppet/cobbler/templates/snippets/mcollective_conf.erb b/deployment/puppet/cobbler/templates/snippets/mcollective_conf.erb index 238d0aef76..11cb1ba812 100644 --- a/deployment/puppet/cobbler/templates/snippets/mcollective_conf.erb +++ b/deployment/puppet/cobbler/templates/snippets/mcollective_conf.erb @@ -10,10 +10,8 @@ daemonize = 1 direct_addressing = 1 # Set huge value of ttl to avoid cases with unsyncronized time between nodes -# bash$ date -d '2033-5-18 3:33:20 UTC' +%s -# 5400 -# It means that ttl equals 1 hours and a half. -ttl = 5400 +# It means that ttl approximately equal to 50 days +ttl = 4294957 # Plugins securityprovider = psk diff --git a/deployment/puppet/cobbler/templates/snippets/ubuntu_mcollective_config.erb b/deployment/puppet/cobbler/templates/snippets/ubuntu_mcollective_config.erb index 7efe81d934..1f2c7093d5 100644 --- a/deployment/puppet/cobbler/templates/snippets/ubuntu_mcollective_config.erb +++ b/deployment/puppet/cobbler/templates/snippets/ubuntu_mcollective_config.erb @@ -12,10 +12,8 @@ daemonize = 0 direct_addressing = 1 # Set huge value of ttl to avoid cases with unsyncronized time between nodes -# bash$ date -d '2033-5-18 3:33:20 UTC' +%s -# 5400 -# It means that ttl equals 1 hours and a half. -ttl = 5400 +# It means that ttl approximately equal to 50 days +ttl = 4294957 # Plugins securityprovider = psk diff --git a/deployment/puppet/mcollective/templates/client.cfg.erb b/deployment/puppet/mcollective/templates/client.cfg.erb index a0b8053803..3bc5fa299d 100644 --- a/deployment/puppet/mcollective/templates/client.cfg.erb +++ b/deployment/puppet/mcollective/templates/client.cfg.erb @@ -9,9 +9,9 @@ direct_addressing = 1 securityprovider = psk plugin.psk = <%= pskey %> -# 5400 -# It means that ttl equals 1 hours and a half. -ttl = 5400 +# Set huge value of ttl to avoid cases with unsyncronized time between nodes +# It means that ttl approximately equal to 50 days +ttl = 4294957 <% if scope.lookupvar('mcollective::client::stomp') -%> connector = stomp diff --git a/deployment/puppet/mcollective/templates/client.cfg.ubuntu.erb b/deployment/puppet/mcollective/templates/client.cfg.ubuntu.erb index d499f9ec94..6f4416c2b1 100644 --- a/deployment/puppet/mcollective/templates/client.cfg.ubuntu.erb +++ b/deployment/puppet/mcollective/templates/client.cfg.ubuntu.erb @@ -9,9 +9,9 @@ direct_addressing = 1 securityprovider = psk plugin.psk = <%= pskey %> -# 5400 -# It means that ttl equals 1 hours and a half. -ttl = 5400 +# Set huge value of ttl to avoid cases with unsyncronized time between nodes +# It means that ttl approximately equal to 50 days +ttl = 4294957 <% if scope.lookupvar('mcollective::client::stomp') -%> connector = stomp diff --git a/deployment/puppet/mcollective/templates/server.cfg.erb b/deployment/puppet/mcollective/templates/server.cfg.erb index 2c0b50b4e5..9746e26064 100644 --- a/deployment/puppet/mcollective/templates/server.cfg.erb +++ b/deployment/puppet/mcollective/templates/server.cfg.erb @@ -8,10 +8,8 @@ daemonize = 1 identity = master # Set huge value of ttl to avoid cases with unsyncronized time between nodes -# bash$ date -d '2033-5-18 3:33:20 UTC' +%s -# 5400 -# It means that ttl equals 1 hours and a half. -ttl = 5400 +# It means that ttl approximately equal to 50 days +ttl = 4294957 # Plugins securityprovider = psk