aboutsummaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel/0018-states-maas-Batch-apply-linux-state-with-b-4.patch
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-24 19:18:30 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-24 19:19:30 +0200
commit4f1bfdd657da7f8daa928e79041405de86993d8f (patch)
tree33b13b618f0a418ca6844592c71ad987ced501fa /patches/opnfv-fuel/0018-states-maas-Batch-apply-linux-state-with-b-4.patch
parent8bdc4f87ac1e5a1630b028d33364e92232e991bd (diff)
p/fuel: states: maas: Batch apply linux state
Change-Id: I62f96c93b67c79732dc8737ff5746475eb5259a6 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0018-states-maas-Batch-apply-linux-state-with-b-4.patch')
-rw-r--r--patches/opnfv-fuel/0018-states-maas-Batch-apply-linux-state-with-b-4.patch42
1 files changed, 42 insertions, 0 deletions
diff --git a/patches/opnfv-fuel/0018-states-maas-Batch-apply-linux-state-with-b-4.patch b/patches/opnfv-fuel/0018-states-maas-Batch-apply-linux-state-with-b-4.patch
new file mode 100644
index 00000000..3f4986b4
--- /dev/null
+++ b/patches/opnfv-fuel/0018-states-maas-Batch-apply-linux-state-with-b-4.patch
@@ -0,0 +1,42 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Thu, 24 Aug 2017 03:50:11 +0200
+Subject: [PATCH] states: maas: Batch apply linux state with `-b 4`
+
+Applying heavy states like linux.network on multiple nodes in
+parallel might lead to spurious timeouts on slower systems.
+
+Compromise between speed and realiability by applying this state
+in batches of 4 nodes at once.
+
+While at it, increase global command_timeout to 15s on Salt master,
+since default command timeout (10s) is sometimes too small for all
+minions to return within the required timeslot. Increase it by 50%.
+
+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..697f83c 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 -b 4"
+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: