summaryrefslogtreecommitdiffstats
path: root/mcp/config/states/virtual_control_plane
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-12-12 20:37:27 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-12-13 15:08:33 +0000
commitd3e789f41e7d8bbff9539d0897b8b5b8974f0d53 (patch)
tree9d1b24dcb21b27f8d192691143efccf27658e09d /mcp/config/states/virtual_control_plane
parenta23158bf220be16f1eecc244e88e5244da433077 (diff)
[VCP] Reboot all VCP VMs after network config
Currently, PXE/admin on VCP nodes still uses MaaS DHCP before the new network configuration is enforced. A live network refresh would break minion registration with the Salt master, so perform a node reboot instead. Change-Id: I1c25f63f6c98a9fff98108d3fad9550dd4468355 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 59cc3ee4457005bdea78b2a407243d4fcb32f177)
Diffstat (limited to 'mcp/config/states/virtual_control_plane')
-rwxr-xr-xmcp/config/states/virtual_control_plane4
1 files changed, 2 insertions, 2 deletions
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 5b54bb8a4..ffb2c594e 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -58,7 +58,7 @@ 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*' system.reboot
-wait_for 30.0 "salt -C 'prx*' test.ping"
+salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' system.reboot
+wait_for 30.0 "salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' test.ping"
salt -C 'E@^(?!cfg01|mas01|kvm|cmp00).*' pkg.upgrade refresh=False dist_upgrade=True