summaryrefslogtreecommitdiffstats
path: root/extraconfig/tasks
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-07 14:31:00 +0000
committerGerrit Code Review <review@openstack.org>2016-03-07 14:31:00 +0000
commit582a3115f744af151f4cd36a5ad0ac3e8ef09a7f (patch)
tree0ae48cef435d7c2830d687b25d9c5b4e1146b0f6 /extraconfig/tasks
parent55fb175bed3a020bbc5cb1c41235f0893ac43cc4 (diff)
parent8da8b84560fc7fcc4c332c03f4242946a18955e9 (diff)
Merge "Revert "Deploy Aodh services, replacing Ceilometer Alarm""
Diffstat (limited to 'extraconfig/tasks')
-rwxr-xr-xextraconfig/tasks/yum_update.sh9
1 files changed, 2 insertions, 7 deletions
diff --git a/extraconfig/tasks/yum_update.sh b/extraconfig/tasks/yum_update.sh
index 9fc17f63..59e4be45 100755
--- a/extraconfig/tasks/yum_update.sh
+++ b/extraconfig/tasks/yum_update.sh
@@ -53,14 +53,12 @@ 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
@@ -109,9 +107,6 @@ 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