diff options
Diffstat (limited to 'mcp/config/states')
| -rwxr-xr-x | mcp/config/states/dpdk | 3 | ||||
| -rwxr-xr-x | mcp/config/states/maas | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/mcp/config/states/dpdk b/mcp/config/states/dpdk index 5ae2aac48..281b78fed 100755 --- a/mcp/config/states/dpdk +++ b/mcp/config/states/dpdk @@ -12,8 +12,5 @@ CI_DEBUG=${CI_DEBUG:-0}; [[ "${CI_DEBUG}" =~ (false|0) ]] || set -x # shellcheck disable=SC1090 source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh" -salt -I 'nova:compute' system.reboot -wait_for 90.0 "salt -I 'nova:compute' test.ping" - salt -I 'nova:compute' alternatives.set ovs-vswitchd /usr/lib/openvswitch-switch-dpdk/ovs-vswitchd-dpdk salt -I 'nova:compute' service.restart openvswitch-switch diff --git a/mcp/config/states/maas b/mcp/config/states/maas index 8f7a86611..dcbdf98cc 100755 --- a/mcp/config/states/maas +++ b/mcp/config/states/maas @@ -77,7 +77,7 @@ salt -C 'mas01*' state.apply maas.machines # cleanup outdated salt keys sleep 30 salt-key --out yaml | awk '!/^(minions|- cfg01|- mas01)/ {print $2}' | \ - xargs -I{} salt-key -yd {} + xargs --no-run-if-empty -I{} salt-key -yd {} # MaaS node deployment wait_for 10 maas_fixup |