aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/config/states
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-29 01:21:30 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-30 01:25:13 +0200
commitda551c09038403de443d2eb563c91f42ad4d0f22 (patch)
treeda2b82603dea785e71cb8045e9119286a9f3a7be /mcp/config/states
parentd8c77e4e5453a27a66387d7deb23dba06d1e3ae7 (diff)
states: maas: Retry linux state if no response
JIRA: FUEL-283 Change-Id: Ie85af8c12163fac28cb8826aa8902a4ff3dec623 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config/states')
-rwxr-xr-xmcp/config/states/maas3
1 files changed, 2 insertions, 1 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 01f8ee0cd..710ec0e82 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -102,7 +102,8 @@ done
wait_for 10 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply salt"
-wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp"
+wait_for 10 "! salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp | " \
+ "tee /dev/stderr | fgrep -q 'Not connected'"
wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
$(awk 'NR==1{print $2}' $(eval echo ~${SUDO_USER}/.ssh/authorized_keys))"