From da551c09038403de443d2eb563c91f42ad4d0f22 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 29 Aug 2017 01:21:30 +0200 Subject: states: maas: Retry linux state if no response JIRA: FUEL-283 Change-Id: Ie85af8c12163fac28cb8826aa8902a4ff3dec623 Signed-off-by: Alexandru Avadanii --- mcp/config/states/maas | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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))" -- cgit 1.2.3-korg