[VCP] Catch 'no response' when adding ssh auth key 99/51399/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Tue, 30 Jan 2018 23:56:35 +0000 (00:56 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 31 Jan 2018 15:36:33 +0000 (15:36 +0000)
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)

mcp/config/states/virtual_control_plane

index 9a77c76..f97e9b7 100755 (executable)
@@ -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