summaryrefslogtreecommitdiffstats
path: root/mcp/config/states/maas
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-02 02:59:12 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-08-03 17:41:10 +0200
commit827d8e0ea6f083f3b2082c8906a41258ed52f51a (patch)
tree22a7c263646d25c8c88a6d24411357a2909c0715 /mcp/config/states/maas
parentc4156877d3f3f4f7efbca6e129bbeafdbe877d22 (diff)
[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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/config/states/maas')
-rwxr-xr-xmcp/config/states/maas2
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index ec2458234..f321b7160 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -101,6 +101,6 @@ salt -C 'mas01*' pillar.item\
maas:region:admin:password
# Check all baremetal nodes are available
-wait_for 5.0 "(for n in ${bm_nodes}; do salt \${n} test.ping 2>/dev/null || exit; done)"
+wait_for 10.0 "(for n in ${bm_nodes}; do salt \${n} test.ping 2>/dev/null || exit; done)"
wait_for 10.0 "salt -C '* and not cfg01* and not mas01*' saltutil.sync_all"