From 32f25307a69c69b002f3f7a220fa6bae2d4d110d Mon Sep 17 00:00:00 2001 From: Vladimir Sharshov Date: Thu, 8 May 2014 07:44:30 +0400 Subject: [PATCH] Set max avaliable TTL for Mcollective We use virtual machine snapshots for CI. When we up it from snapshots, we get error: "MCollective agents '' didn't respond within the allotted time.", but node is online. Big TTL in Mcollective should solve this problem. Change-Id: Id3f2f5ddf26a9d31de214e9d5596a47f450b983f Closes-Bug: #1316720 --- .../puppet/cobbler/templates/snippets/mcollective_conf.erb | 6 ++---- .../templates/snippets/ubuntu_mcollective_config.erb | 6 ++---- deployment/puppet/mcollective/templates/client.cfg.erb | 6 +++--- .../puppet/mcollective/templates/client.cfg.ubuntu.erb | 6 +++--- deployment/puppet/mcollective/templates/server.cfg.erb | 6 ++---- 5 files changed, 12 insertions(+), 18 deletions(-) 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 4f5f383924..b090578c44 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 @stomp -%> connector = stomp diff --git a/deployment/puppet/mcollective/templates/client.cfg.ubuntu.erb b/deployment/puppet/mcollective/templates/client.cfg.ubuntu.erb index 0d7c7cfed6..79438ff6a0 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 @stomp -%> connector = stomp diff --git a/deployment/puppet/mcollective/templates/server.cfg.erb b/deployment/puppet/mcollective/templates/server.cfg.erb index 0220b6517d..8c04c9bb2d 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