summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-01-31 08:20:16 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-31 08:20:16 +0000
commit989fff453c339c9bc876ef0ef624edd5759da8e3 (patch)
tree60395cd15083e9af66e32cdfd40d635baf7e3dda
parent8621846f46b63ac6b2276cbb105331ae0a34dec8 (diff)
parentb254aef5a34c7fc96db5c0a330c757fe9d51be76 (diff)
Merge "[VCP] Catch 'no response' when adding ssh auth key"
-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 75347d918..338c4470f 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