aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-31 00:56:35 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-01-31 15:36:33 +0000
commit9b836d5ac09646319dbd81eff7222186598218a3 (patch)
treed538621c11836c643a58bcbb504fb073c0b7faab
parentd99a846e0aaa5b3de1bc2328a45fb4694fe3f1cf (diff)
[VCP] Catch 'no response' when adding ssh auth key
On rare occassions, one or more minions might fail to respond in due time, so catch 'no reponse' using `wait_for`. Change-Id: I8e6b0dc44a39e79c2874ff9a657e152620ba3f13 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit b254aef5a34c7fc96db5c0a330c757fe9d51be76)
-rwxr-xr-xmcp/config/states/virtual_control_plane2
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 9a77c764d..f97e9b712 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -61,7 +61,7 @@ salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' cp.get_file \
wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply salt"
wait_for 10.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp"
-wait_for 10 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
+wait_for 10.0 "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")")"
# Disable proxy dhcp routes after installation