X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=extraconfig%2Ftasks%2Fmajor_upgrade_pacemaker_migrations.sh;h=6d02acc869b0958e305388d18b9fab78483f7f5c;hb=61ec62e0807c87ce901bdc00aa4482438666160a;hp=df87c93fad2a56bb58162d6100496bfe3aed934d;hpb=ccbc75a814e059f63453c2b40cc100709e858927;p=apex-tripleo-heat-templates.git

diff --git a/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh b/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
index df87c93f..6d02acc8 100644
--- 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
@@ -170,12 +169,24 @@ function migrate_full_to_ng_ha {
     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
+}
+
+
 # This function will make sure that the rabbitmq ha policies are converted from mitaka to newton
-# In mitaka we had: Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"
-# In newton we want: Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"exactly","ha-params":2}"
+# In newton we had: Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"all"}"
+# In ocata we want: Attributes: set_policy="ha-all ^(?!amq\.).* {"ha-mode":"exactly","ha-params":2}"
 # The nr "2" should be CEIL(N/2) where N is the number of Controllers (i.e. rabbit instances)
 # Note that changing an attribute like this makes the rabbitmq resource restart
-function rabbitmq_mitaka_newton_upgrade {
+function rabbitmq_newton_ocata_upgrade {
     if pcs resource show rabbitmq-clone | grep -q -E "Attributes:.*\"ha-mode\":\"all\""; then
         # Number of controller is obtained by counting how many hostnames we
         # have in controller_node_names hiera key