diff options
| -rwxr-xr-x | mcp/config/states/baremetal_init | 5 | ||||
| -rwxr-xr-x | mcp/config/states/virtual_control_plane | 1 | ||||
| -rw-r--r-- | mcp/salt-formulas/opnfv/route_wrapper.sls | 27 | ||||
| -rwxr-xr-x | mcp/scripts/salt.sh | 1 |
4 files changed, 1 insertions, 33 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" diff --git a/mcp/salt-formulas/opnfv/route_wrapper.sls b/mcp/salt-formulas/opnfv/route_wrapper.sls deleted file mode 100644 index 6132f317e..000000000 --- a/mcp/salt-formulas/opnfv/route_wrapper.sls +++ /dev/null @@ -1,27 +0,0 @@ -############################################################################## -# Copyright (c) 2018 Mirantis Inc., Enea AB and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## -/usr/local/sbin/route: - file.managed: - - contents: | - #!/bin/sh - - # Workaround salt-managed routes breaking ifup when route already exists - route_binary='/sbin/route' - route_output=$("${route_binary}" "$@" 2>&1) - route_return=$? - - if [ -n "${route_output}" ]; then - if echo "${route_output}" | grep -q 'SIOCADDRT: File exists'; then - exit 0 - fi - echo "${route_output}" - fi - exit "${route_return}" - - user: root - - group: root - - mode: 755 diff --git a/mcp/scripts/salt.sh b/mcp/scripts/salt.sh index dc2226e34..6a250dd67 100755 --- a/mcp/scripts/salt.sh +++ b/mcp/scripts/salt.sh @@ -119,7 +119,6 @@ ssh ${SSH_OPTS} "${SSH_SALT}" bash -s -e << SALT_INSTALL_END wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.system,linux.storage' wait_for 2.0 'salt -C "E@^(${NODE_MASK}).*" state.sls linux.network' - salt -C "E@^(${NODE_MASK}).*" state.sls opnfv.route_wrapper salt -C "E@^(${NODE_MASK}).*" system.reboot wait_for 90.0 'salt -C "E@^(${NODE_MASK}).*" test.ping' wait_for 3.0 'salt -C "E@^(${NODE_MASK}).*" pkg.upgrade refresh=False dist_upgrade=True' |