aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests/overcloud_controller.pp
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-12-08 21:27:04 +0000
committerGerrit Code Review <review@openstack.org>2015-12-08 21:27:04 +0000
commit99bd9970d6bedee8228a6c8ff3d6f45aa1380e22 (patch)
treeac8031bd64191d809e6b98dd9f9773f8a54d2381 /puppet/manifests/overcloud_controller.pp
parent2674efae84f6ba808fbaa5f0150825e42a86ba59 (diff)
parent648099e1925e7d0d3f6906e5e8d15f3871e88460 (diff)
Merge "Remove Ceilometer Alarm from the overcloud"
Diffstat (limited to 'puppet/manifests/overcloud_controller.pp')
-rw-r--r--puppet/manifests/overcloud_controller.pp2
1 files changed, 0 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index a8abbb77..683c1213 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -450,8 +450,6 @@ if hiera('step') >= 3 {
include ::ceilometer::api
include ::ceilometer::agent::notification
include ::ceilometer::agent::central
- include ::ceilometer::alarm::notifier
- include ::ceilometer::alarm::evaluator
include ::ceilometer::expirer
include ::ceilometer::collector
include ::ceilometer::agent::auth