summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-07 13:41:42 +0000
committerGerrit Code Review <review@openstack.org>2015-07-07 13:41:42 +0000
commit1a1a2fb3521342efb85d499dde999073734fc015 (patch)
tree1fce60d67d51889c6663b01de6ce444e42b16b53 /puppet
parent0bbf34a21b1eecdfdf1bacc14ea0b93edbbd2435 (diff)
parent111d8071e73aa113f57a68707ec1c1e0f4e366c3 (diff)
Merge "Drop swift ceilometer middleware for pacemaker"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 582e29ef..3c5a0151 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -719,7 +719,6 @@ if hiera('step') >= 3 {
include ::swift::proxy::keystone
include ::swift::proxy::authtoken
include ::swift::proxy::staticweb
- include ::swift::proxy::ceilometer
include ::swift::proxy::ratelimit
include ::swift::proxy::catch_errors
include ::swift::proxy::tempurl