summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-07 20:03:09 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-07 21:27:09 +0100
commitf78cd791f2529b571152e634aa9141ab993d723e (patch)
tree325d2e723b528892ad7108c881fa5e97177ffe55 /mcp
parent2f874c8729bd80f34e5994fe07f116c82c9b1695 (diff)
[states] Fix broken online check for bm, vcp nodes
Previous commit replacing explicit loops with `wait_for` failed to properly escape a nested variable, leading to deploy failure. Also, the logic was flawed, not breaking for offline nodes, rendering the whole barrier check useless. Fixes: 1a0e8e7e Change-Id: I038dbf90fb53c6b61da2e5c9b6867e31d78867af Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
-rwxr-xr-xmcp/config/states/maas6
-rwxr-xr-xmcp/config/states/virtual_control_plane4
2 files changed, 5 insertions, 5 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 8c9411923..116bc45cd 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -15,7 +15,7 @@ source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/globals.sh"
source "$(dirname "${BASH_SOURCE[0]}")/../../scripts/lib.sh"
bm_nodes=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \
- awk '/^\s+\w+[[:digit:]]+:$/ {gsub(/:$/, "*"); print $1}')
+ awk '/^\s+\w+[[:digit:]]+:$/ {gsub(/:$/, "*"); printf "%s ", $1}')
# Wait for MaaS commissioning/deploy to finish, retry on failure
function maas_fixup() {
@@ -75,7 +75,7 @@ salt -C 'mas01*' state.apply maas.cluster
wait_for 10 "salt -C 'mas01*' state.apply maas.region"
-if [ -n "${bm_nodes[*]}" ]; then
+if [ -n "${bm_nodes}" ]; then
salt -C 'mas01*' state.apply maas.machines
fi
@@ -92,6 +92,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; done"
+wait_for 5.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"
diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
index 328a6416b..48e45d426 100755
--- a/mcp/config/states/virtual_control_plane
+++ b/mcp/config/states/virtual_control_plane
@@ -33,10 +33,10 @@ salt -C 'kvm* or cmp*' state.apply salt
wait_for 10.0 "salt -C 'kvm*' state.sls salt.control"
vcp_nodes=$(salt --out yaml 'kvm01*' pillar.get salt:control:cluster:internal:node | \
- awk '/\s+\w+:$/ {gsub(/:$/, "*"); print $1}')
+ awk '/\s+\w+:$/ {gsub(/:$/, "*"); printf "%s ", $1}')
# Check all vcp nodes are available
-wait_for 25.0 "for n in ${vcp_nodes}; do salt '${n}' test.ping 2>/dev/null; done"
+wait_for 25.0 "(for n in ${vcp_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"