openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Filter for local nodes in check_resource function"

Browse Source
This commit is contained in:
Jenkins 2016-04-05 16:14:39 +00:00 committed by Gerrit Code Review
commit 517f6b27a9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
extraconfig/tasks/pacemaker_common_functions.sh
View File

@ -19,8 +19,9 @@ function check_resource {
match_for_incomplete='Stopped' match_for_incomplete='Stopped'
fi fi
nodes_local=$(pcs status | grep ^Online | sed 's/.*\[ \(.*\) \]/\1/g' | sed 's/ /\|/g')
if timeout -k 10 $timeout crm_resource --wait; then if timeout -k 10 $timeout crm_resource --wait; then
node_states=$(pcs status --full | grep "$service" | grep -v Clone) node_states=$(pcs status --full | grep "$service" | grep -v Clone | { egrep "$nodes_local" || true; } )
if echo "$node_states" | grep -q "$match_for_incomplete"; then if echo "$node_states" | grep -q "$match_for_incomplete"; then
echo_error "ERROR: cluster finished transition but $service was not in $state state, exiting." echo_error "ERROR: cluster finished transition but $service was not in $state state, exiting."
exit 1 exit 1