X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=mcp%2Fconfig%2Fstates%2Fvirtual_control_plane;h=c391cfe6f4a7757797d79e361342099992b59cf1;hb=4fae473d4343f78facda713b5626b47d3dd33e9c;hp=328a6416bc38b2d670bf3bcd9e8fcb08e4dcf356;hpb=1a0e8e7e86aa5884a678ba448c6eb09c00ecc032;p=fuel.git

diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 328a6416b..c391cfe6f 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -33,10 +33,10 @@ salt -C 'kvm* or cmp*' state.apply salt
 wait_for 10.0 "salt -C 'kvm*' state.sls salt.control"
 
 vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:node | \
-            awk '/\s+\w+:$/ {gsub(/:$/, "*"); print $1}')
+            awk '/\s+\w+:$/ {gsub(/:$/, "*"); printf "%s ", $1}')
 
 # Check all vcp nodes are available
-wait_for 25.0 "for n in ${vcp_nodes}; do salt '${n}' test.ping 2>/dev/null; done"
+wait_for 25.0 "(for n in ${vcp_nodes}; do salt \${n} test.ping 2>/dev/null || exit; done)"
 
 wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"
 
@@ -48,7 +48,7 @@ cd /srv/salt/env/prd/maas/files && ln -sf \
 salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' cp.get_file \
   "salt://maas/files/$(basename "${APT_CONF_D_CURTIN}")" "${APT_CONF_D_CURTIN}"
 
-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 salt"
 wait_for 10.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' state.apply linux,ntp"
 
 wait_for 10.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_USER} \
@@ -57,6 +57,7 @@ wait_for 10.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' ssh.set_auth_key ${SUDO_
 # Disable proxy dhcp routes after installation
 salt -C 'prx*' file.write /etc/dhcp/dhclient-enter-hooks.d/no-default-route \
   args='unset new_routers'
+salt -C 'prx*' state.apply opnfv.route_wrapper
 salt -C 'prx*' system.reboot
 wait_for 30.0 "salt -C 'prx*' test.ping"