diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-24 17:10:33 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-08-24 17:11:05 +0200 |
| commit | 8d0731eecbb4c7f78e23c8a7e93004da7593afbe (patch) | |
| tree | 3cd9b7079a159801ba072f4f26056bd09b6283b9 /patches/opnfv-fuel/0020-salt-master-Increase-command_timeout-to-15s.patch | |
| parent | aa6c72b42783a4226c07e0b7af37434f13dc8c64 (diff) | |
p/fuel: Rebase after MaaS retry got upstream
Change-Id: I321fcb4aa77ebcb4595a9468c2257fef8b9a8ed6
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel/0020-salt-master-Increase-command_timeout-to-15s.patch')
| -rw-r--r-- | patches/opnfv-fuel/0020-salt-master-Increase-command_timeout-to-15s.patch | 38 |
1 files changed, 0 insertions, 38 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 deleted file mode 100644 index 3380de0a..00000000 --- a/patches/opnfv-fuel/0020-salt-master-Increase-command_timeout-to-15s.patch +++ /dev/null @@ -1,38 +0,0 @@ -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: |