summaryrefslogtreecommitdiffstats
path: root/extraconfig/tasks
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-03 20:40:03 +0000
committerGerrit Code Review <review@openstack.org>2016-03-03 20:40:03 +0000
commit6be32543479589dedcae7502e6fe2167efeda710 (patch)
treeaac8c0b8b2b5899c9432dbec50d292bc820c4c18 /extraconfig/tasks
parent3986128c283227b8eb16d1ff1776175e6de12c54 (diff)
parentf72aed85594f223b6f888e6d0af3c880ea581a66 (diff)
Merge "Deploy Aodh services, replacing Ceilometer Alarm"
Diffstat (limited to 'extraconfig/tasks')
-rwxr-xr-xextraconfig/tasks/yum_update.sh9
1 files changed, 7 insertions, 2 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh
index 59e4be45..9fc17f63 100755
--- a/extraconfig/tasks/yum_update.sh
+++ b/extraconfig/tasks/yum_update.sh
@@ -53,12 +53,14 @@ 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-api
+openstack-aodh-evaluator
+openstack-aodh-notifier
+openstack-aodh-listener
openstack-cinder-api
openstack-cinder-scheduler
openstack-cinder-volume
@@ -107,6 +109,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