From: Alexandru Avadanii Date: Sat, 1 Sep 2018 00:40:44 +0000 (+0200) Subject: [AArch64] vcp: Fix up vcp_nodes awk query conflict X-Git-Tag: opnfv-7.0.0~69 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=57040b97c6317a94020ad27b8001ac0965b208f7;p=fuel.git [AArch64] vcp: Fix up vcp_nodes awk query conflict JIRA: FUEL-404 Change-Id: I12acc90cdb17ecc090a993e1be41d13ad81dbb9d Signed-off-by: Alexandru Avadanii --- diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane index 4e8d5e573..ef6ce59c3 100755 --- a/mcp/config/states/virtual_control_plane +++ b/mcp/config/states/virtual_control_plane @@ -37,7 +37,7 @@ 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(/:$/, "*"); printf "%s ", $1}') + awk '/\s+\w+[[:digit:]]+:$/ {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 || exit; done)"