From 827d8e0ea6f083f3b2082c8906a41258ed52f51a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 2 Aug 2018 02:59:12 +0200 Subject: [lib.sh] Reset virtual nodes after MaaS install For hybrid PODs (e.g. x86_64 jumpserver + control nodes, aarch64 baremetal compute nodes), the virtual nodes rely on MaaS DHCP to be up when the OS boots, so issue a `virsh reset` accordingly. Instead of checking for online nodes using `test.ping`, use `saltutil.sync_all` to also sync Salt state modules to the virtual nodes (usually handled by baremetal_init state in HA deploys). JIRA: FUEL-338 Change-Id: If689d057dc4438102c3a7428a97b9638e21bfdc5 Signed-off-by: Alexandru Avadanii --- ci/deploy.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ci') diff --git a/ci/deploy.sh b/ci/deploy.sh index 10b639e3c..40176073d 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -313,6 +313,11 @@ else wait_for 5 "ssh ${SSH_OPTS} ${SSH_SALT} sudo \ CI_DEBUG=$CI_DEBUG ERASE_ENV=$ERASE_ENV \ /root/fuel/mcp/config/states/${state}" + if [ "${state}" = 'maas' ]; then + # For hybrid PODs (virtual + baremetal nodes), the virtual nodes + # should be reset to force a DHCP request from MaaS DHCP + reset_vms "${virtual_nodes[@]}" + fi done fi -- cgit 1.2.3-korg