Merge "Add keystone networks for the different endpoints"

[apex-tripleo-heat-templates.git] / extraconfig / tasks / pacemaker_common_functions.sh

diff --git a/extraconfig/tasks/pacemaker_common_functions.sh b/extraconfig/tasks/pacemaker_common_functions.sh
index 0808763..7d794c9 100755 (executable)
--- a/extraconfig/tasks/pacemaker_common_functions.sh
+++ b/extraconfig/tasks/pacemaker_common_functions.sh
@@ -19,8 +19,9 @@ function check_resource {
       match_for_incomplete='Stopped'
   fi
 
+  nodes_local=$(pcs status  | grep ^Online | sed 's/.*\[ \(.*\) \]/\1/g' | sed 's/ /\|/g')
   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
           echo_error "ERROR: cluster finished transition but $service was not in $state state, exiting."
           exit 1