diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-06 21:30:12 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-07 04:04:36 +0100 |
| commit | 2bbab1873ef629e89ac92ec195feb15b86cf8295 (patch) | |
| tree | 14cc01ec29b07d60007e886cb6cf910f6f43b9a7 | |
| parent | 3f559299c232bbb7639d02243c95d6256cdf94d4 (diff) | |
salt.sh: Fix linux state apply on cfg01
cfg01 does not repond or is not connected while trying to apply
linux state via salt.sh, use wait_for macro to account for this.
JIRA: ARMBAND-315
Change-Id: I2d4c63d43f806b65f9ce327f4a00a6334be88750
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
| -rwxr-xr-x | mcp/scripts/salt.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index d2930be8a..a13194363 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -81,7 +81,8 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list formulas cd ${OPNFV_FUEL_DIR}/mcp/patches && ./patch.sh patches.list reclass - salt-call state.apply salt + source ${OPNFV_FUEL_DIR}/mcp/scripts/lib.sh + wait_for 3.0 "salt-call state.apply salt" # In case scenario changed (and implicitly domain name), re-register minions if [ -n "\${OLD_DOMAIN}" ] && [ "\${OLD_DOMAIN}" != "${CLUSTER_DOMAIN}" ]; then @@ -94,10 +95,9 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END # Init specific to VMs on FN (all for virtual, cfg|mas for baremetal) salt -C "${NODE_MASK} or cfg01*" saltutil.sync_all - salt -C "${NODE_MASK} or cfg01*" state.apply salt | \ - grep -Fq 'No response' && salt -C "${NODE_MASK} or cfg01*" state.apply salt + wait_for 3.0 'salt -C "${NODE_MASK} or cfg01*" state.apply salt' + wait_for 3.0 'salt -C "cfg01*" state.apply linux' - salt-call state.sls linux || salt-call state.sls linux salt -C "${NODE_MASK} and not cfg01*" state.sls linux || true salt -C "${NODE_MASK} and not cfg01*" pkg.upgrade refresh=False |