summaryrefslogtreecommitdiffstats
path: root/mcp/config
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-07-24 11:10:21 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-07-24 11:10:21 +0000
commitc51c387f8c7d1c9ee03e35822c896432e4d646a0 (patch)
treebf4c9730e994174b706d03645d83bec27be138e2 /mcp/config
parent24572d5956da62b1492c053cac82037b266a6739 (diff)
parent54acfffcbc655b72912eef4c1b2133a3b8feec1d (diff)
Merge "[salt-formulas] opnfv: Drop obsolete route_wrapper"
Diffstat (limited to 'mcp/config')
-rwxr-xr-xmcp/config/states/baremetal_init5
-rwxr-xr-xmcp/config/states/virtual_control_plane1
2 files changed, 1 insertions, 5 deletions
diff --git a/mcp/config/states/baremetal_init b/mcp/config/states/baremetal_init
index 6a44b788b..3e5f659fd 100755
--- a/mcp/config/states/baremetal_init
+++ b/mcp/config/states/baremetal_init
@@ -25,10 +25,7 @@ salt -C 'kvm* or cmp*' file.replace $debian_ip_source \
salt -C 'kvm* or cmp*' pkg.install bridge-utils
salt -C 'kvm*' state.apply linux.network,linux.system.kernel
wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply salt.minion"
-wait_for 5.0 "salt -C 'cmp*' state.apply linux.system"
-# wrap distro `route` binary to silence errors when route already exists
-wait_for 5.0 "salt -C 'kvm* or cmp*' state.apply opnfv.route_wrapper"
-wait_for 5.0 "salt -C 'cmp*' state.apply linux.network"
+wait_for 5.0 "salt -C 'cmp*' state.apply linux.system,linux.network"
wait_for 30.0 "salt -C 'kvm* or cmp*' test.ping"
salt -C 'kvm* or cmp*' system.reboot
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 18e6d1cd2..8105b2666 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -54,7 +54,6 @@ 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} \
$(awk 'NR==1{print $2}' "$(eval echo "~${SUDO_USER}/.ssh/authorized_keys")")"
-salt -C 'prx*' state.apply opnfv.route_wrapper
salt -C 'prx*' system.reboot
wait_for 30.0 "salt -C 'prx*' test.ping"