From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Mon, 28 Aug 2017 23:22:28 +0000 (+0200)
Subject: p/fuel: states: maas: Retry linux state if no resp
X-Git-Tag: opnfv-5.0.RC1~58
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F29%2F40529%2F1;p=armband.git

p/fuel: states: maas: Retry linux state if no resp

Change-Id: I5bcfba9fc9536ae388e8e4b13e0826f7f2106613
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch b/patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch
new file mode 100644
index 00000000..d1f5ccb5
--- /dev/null
+++ b/patches/opnfv-fuel/0021-states-maas-Retry-linux-state-if-no-response.patch
@@ -0,0 +1,23 @@
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Tue, 29 Aug 2017 01:21:30 +0200
+Subject: [PATCH] states: maas: Retry linux state if no response
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ 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 9e0093b..c54225d 100755
+--- a/mcp/config/states/maas
++++ b/mcp/config/states/maas
+@@ -104,7 +104,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))"