Merge "Rework gnocchi-upgrade to run in a separate upgrade step"

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

diff --git a/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh b/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
index d974bb7..7c9083a 100644 (file)
--- a/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
+++ b/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
@@ -77,7 +77,6 @@ function services_to_migrate {
     openstack-aodh-evaluator-clone
     openstack-aodh-listener-clone
     openstack-aodh-notifier-clone
-    openstack-ceilometer-api-clone
     openstack-ceilometer-central-clone
     openstack-ceilometer-collector-clone
     openstack-ceilometer-notification-clone
@@ -109,7 +108,7 @@ function services_to_migrate {
 #    during the conversion
 # 2. Remove all the colocation constraints and then the ordering constraints, except the
 #    ones related to haproxy/VIPs which exist in Newton as well
-# 3. Take the cluster out of maintenance-mode and do a resource cleanup
+# 3. Take the cluster out of maintenance-mode
 # 4. Remove all the resources that won't be managed by pacemaker in newton. The
 #    outcome will be
 #    that they are stopped and removed from pacemakers control
@@ -117,13 +116,9 @@ function services_to_migrate {
 function migrate_full_to_ng_ha {
     if [[ -n $(pcmk_running) ]]; then
         pcs property set maintenance-mode=true
-        # We are making sure here that the property has propagated everywhere
-        if ! timeout -k 10 300 crm_resource --wait; then
-            echo_error "ERROR: cluster remained unstable after setting maintenance-mode for more than 300 seconds, exiting."
-            exit 1
-        fi
-        # First we go through all the colocation constraints (except the ones we want to keep, i.e. the haproxy/ip ones)
-        # and we remove those
+
+        # First we go through all the colocation constraints (except the ones
+        # we want to keep, i.e. the haproxy/ip ones) and we remove those
         COL_CONSTRAINTS=$(pcs config show | sed -n '/^Colocation Constraints:$/,/^$/p' | grep -v "Colocation Constraints:" | egrep -v "ip-.*haproxy" | awk '{print $NF}' | cut -f2 -d: |cut -f1 -d\))
         for constraint in $COL_CONSTRAINTS; do
             log_debug "Deleting colocation constraint $constraint from CIB"
@@ -158,7 +153,7 @@ function migrate_full_to_ng_ha {
                  fi
                  pcs resource delete --force "$resource"
              else
-                 log_debug "Service $service not found as a pacemaker resource, not trying to delete."
+                 log_debug "Service $resource not found as a pacemaker resource, not trying to delete."
              fi
         done
 
@@ -173,3 +168,14 @@ function migrate_full_to_ng_ha {
         fi
     fi
 }
+
+function disable_standalone_ceilometer_api {
+    if [[ -n $(is_bootstrap_node) ]]; then
+        if [[ -n $(is_pacemaker_managed openstack-ceilometer-api) ]]; then
+            # Disable pacemaker resources for ceilometer-api
+            manage_pacemaker_service disable openstack-ceilometer-api
+            check_resource_pacemaker openstack-ceilometer-api stopped 600
+            pcs resource delete openstack-ceilometer-api --wait=600
+        fi
+    fi
+}