Merge "Disable the Mon/OSD/Client resources in puppet-ceph-external"

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

diff --git a/extraconfig/tasks/pacemaker_resource_restart.sh b/extraconfig/tasks/pacemaker_resource_restart.sh
index 4e8b20f..b2e5be1 100755 (executable)
--- a/extraconfig/tasks/pacemaker_resource_restart.sh
+++ b/extraconfig/tasks/pacemaker_resource_restart.sh
@@ -3,43 +3,12 @@
 set -eux
 
 pacemaker_status=$(systemctl is-active pacemaker)
-check_interval=3
-
-function check_resource {
-
-  service=$1
-  state=$2
-  timeout=$3
-  tstart=$(date +%s)
-  tend=$(( $tstart + $timeout ))
-
-  if [ "$state" = "stopped" ]; then
-      match_for_incomplete='Started'
-  else # started
-      match_for_incomplete='Stopped'
-  fi
-
-  while (( $(date +%s) < $tend )); do
-      node_states=$(pcs status --full | grep "$service" | grep -v Clone)
-      if echo "$node_states" | grep -q "$match_for_incomplete"; then
-          echo "$service not yet $state, sleeping $check_interval seconds."
-          sleep $check_interval
-      else
-        echo "$service has $state"
-        return
-      fi
-  done
-
-  echo "$service never $state after $timeout seconds" | tee /dev/fd/2
-  exit 1
-
-}
 
 # Run if pacemaker is running, we're the bootstrap node,
 # and we're updating the deployment (not creating).
 if [ "$pacemaker_status" = "active" -a \
      "$(hiera bootstrap_nodeid)" = "$(facter hostname)" -a \
-     "$(hiera update_identifier)" != "nil" ]; then
+     "$(hiera stack_action)" = "UPDATE" ]; then
 
     #ensure neutron constraints like
     #https://review.openstack.org/#/c/245093/
@@ -49,8 +18,8 @@ if [ "$pacemaker_status" = "active" -a \
 
     pcs resource disable httpd
     check_resource httpd stopped 300
-    pcs resource disable openstack-keystone
-    check_resource openstack-keystone stopped 1200
+    pcs resource disable openstack-core
+    check_resource openstack-core stopped 1800
 
     if pcs status | grep haproxy-clone; then
         pcs resource restart haproxy-clone
@@ -61,8 +30,8 @@ if [ "$pacemaker_status" = "active" -a \
     pcs resource restart memcached-clone
     pcs resource restart galera-master
 
-    pcs resource enable openstack-keystone
-    check_resource openstack-keystone started 300
+    pcs resource enable openstack-core
+    check_resource openstack-core started 1800
     pcs resource enable httpd
     check_resource httpd started 800