summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-11-08 02:09:17 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-11-08 02:09:17 +0000
commit07baf599c51cbd42ef14632284537ec4fe126b8a (patch)
treec93623d35d767cec158574d2b47b0d2fcf238027 /mcp
parent93ed07d69c2ca31e7c3da5cc674cacef13581bc7 (diff)
parent225c21b15b0d62dd8b5b37ec8ba372f6ab3964d7 (diff)
Merge "[maas] Conform regex to machines status output" into stable/euphrates
Diffstat (limited to 'mcp')
-rwxr-xr-xmcp/config/states/maas6
1 files changed, 3 insertions, 3 deletions
diff --git a/mcp/config/states/maas b/mcp/config/states/maas
index 070045165..eea3e0ef6 100755
--- a/mcp/config/states/maas
+++ b/mcp/config/states/maas
@@ -19,13 +19,13 @@ function maas_fixup() {
local ncount=$(salt --out yaml 'mas01*' pillar.get maas:region:machines | \
grep -cE '^\s{2}\w+:$')
wait_for 180 "${statuscmd} | tee /dev/stderr | " \
- "grep -Eq '((Deployed|Ready): ${ncount}|status:Failed|status:Allocated)'"
+ "grep -Eq '((Deployed|Ready): ${ncount}|status: (Failed|Allocated))'"
# shellcheck disable=SC2155
local statusout=$(eval "${statuscmd}")
# shellcheck disable=SC2155
local fcnodes=$(echo "${statusout}" | \
- grep -Po '(?<=system_id:)(.*)(?=,status:Failed commissioning)')
+ grep -Pzo 'status: Failed commissioning\n\s+system_id: \K.+\n')
for node_system_id in ${fcnodes}; do
salt -C 'mas01*' state.apply maas.machines.delete \
pillar="{'system_id': '${node_system_id}'}"
@@ -38,7 +38,7 @@ function maas_fixup() {
# shellcheck disable=SC2155
local fdnodes=$(echo "${statusout}" | \
- grep -Po '(?<=system_id:)(.*)(?=,status:(Failed deployment|Allocated))')
+ grep -Pzo 'status: (Failed deployment|Allocated)\n\s+system_id: \K.+\n')
for node_system_id in ${fdnodes}; do
salt -C 'mas01*' state.apply maas.machines.mark_broken_fixed \
pillar="{'system_id': '${node_system_id}'}"