Merge "Deploy Aodh services, replacing Ceilometer Alarm"

2 files changed, 31 insertions, 2 deletions

diff --git a/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh b/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
index 7fd26945..1f420b32 100644
--- a/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
+++ b/extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
@@ -12,3 +12,28 @@
 # The migration functions should be idempotent. If the migration has
 # been already applied, it should be possible to call the function
 # again without damaging the deployment or failing the upgrade.
+
+function remove_ceilometer_alarm {
+    if pcs status | grep openstack-ceilometer-alarm; then
+        # Disable pacemaker resources for ceilometer-alarms
+        pcs resource disable openstack-ceilometer-alarm-evaluator
+        check_resource openstack-ceilometer-alarm-evaluator stopped 600
+        pcs resource delete openstack-ceilometer-alarm-evaluator
+        pcs resource disable openstack-ceilometer-alarm-notifier
+        check_resource openstack-ceilometer-alarm-notifier stopped 600
+        pcs resource delete openstack-ceilometer-alarm-notifier
+
+        # remove constraints
+        pcs constraint remove ceilometer-delay-then-ceilometer-alarm-evaluator-constraint
+        pcs constraint remove ceilometer-alarm-evaluator-with-ceilometer-delay-colocation
+        pcs constraint remove ceilometer-alarm-evaluator-then-ceilometer-alarm-notifier-constraint
+        pcs constraint remove ceilometer-alarm-notifier-with-ceilometer-alarm-evaluator-colocation
+        pcs constraint remove ceilometer-alarm-notifier-then-ceilometer-notification-constraint
+        pcs constraint remove ceilometer-notification-with-ceilometer-alarm-notifier-colocation
+
+    fi
+
+    # uninstall openstack-ceilometer-alarm package
+    yum -y remove openstack-ceilometer-alarm
+
+}
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh
index 59e4be45..66efc5c5 100755
--- a/extraconfig/tasks/yum_update.sh
+++ b/extraconfig/tasks/yum_update.sh
@@ -53,12 +53,13 @@ neutron-l3-agent
 neutron-metadata-agent
 neutron-openvswitch-agent
 neutron-server
-openstack-ceilometer-alarm-evaluator
-openstack-ceilometer-alarm-notifier
 openstack-ceilometer-api
 openstack-ceilometer-central
 openstack-ceilometer-collector
 openstack-ceilometer-notification
+openstack-aodh-evaluator
+openstack-aodh-notifier
+openstack-aodh-listener
 openstack-cinder-api
 openstack-cinder-scheduler
 openstack-cinder-volume
@@ -107,6 +108,9 @@ openstack-nova-scheduler"
         pcs -f $pacemaker_dumpfile constraint order promote redis-master then start openstack-ceilometer-central-clone require-all=false
     fi
 
+    if ! pcs constraint order show | grep "promote redis-master then start openstack-aodh-evaluator-clone"; then
+        pcs -f $pacemaker_dumpfile constraint order promote redis-master then start openstack-aodh-evaluator-clone require-all=false
+    fi
     # ensure neutron constraints https://review.openstack.org/#/c/229466
     # remove ovs-cleanup after server and add openvswitch-agent instead
     if  pcs constraint order show  | grep "start neutron-server-clone then start neutron-ovs-cleanup-clone"; then