aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-24 03:55:31 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-24 03:55:50 +0200
commit4acb9cb824de19c8cb5eb73401529a51ce1de561 (patch)
tree244ab0a00982df733655ce23470f14286b822169 /patches/opnfv-fuel
parentc4c13ebf82d7353e7ca5087bdf0b726b1e146e69 (diff)
salt-master: Increase command timeout to 15s
Change-Id: I85221e65823780063b127298264a0087b59ac8a4 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel')
-rw-r--r--patches/opnfv-fuel/0020-salt-master-Increase-command_timeout-to-15s.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0020-salt-master-Increase-command_timeout-to-15s.patch b/patches/opnfv-fuel/0020-salt-master-Increase-command_timeout-to-15s.patch
new file mode 100644
index 0000000..3380de0
--- /dev/null
+++ b/patches/opnfv-fuel/0020-salt-master-Increase-command_timeout-to-15s.patch
@@ -0,0 +1,38 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 24 Aug 2017 03:50:11 +0200
+Subject: [PATCH] salt-master: Increase command_timeout to 15s
+
+Default command timeout (10s) is sometimes too small for all minions
+to return within the required timeslot. Increase it by 50%.
+
+While at it, increase the timeout used for executing the "linux"
+state against all nodes to 60s, just to be on the safe side.
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ mcp/config/states/maas | 2 +-
+ mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/mcp/config/states/maas b/mcp/config/states/maas
+index 12ef9ed..14f32ee 100755
+--- a/mcp/config/states/maas
++++ b/mcp/config/states/maas
+@@ -107,4 +107,4 @@ wait_for 10 "salt -C '* and not cfg01* and not mas01*' ssh.set_auth_key ${SUDO_U
+
+ wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
+ wait_for 10 "salt -C '* and not cfg01* and not mas01*' state.apply salt"
+-wait_for 10 "salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp"
++wait_for 10 "salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp -t 60"
+diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
+index 7d95ebc..46526da 100644
+--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
++++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
+@@ -37,6 +37,7 @@ parameters:
+ salt:
+ master:
+ accept_policy: open_mode
++ command_timeout: 15
+ reclass:
+ storage:
+ data_source: