diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-29 13:54:37 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-29 13:54:38 +0000 |
| commit | 5d1738f6e3fcdd73bb3fa1c64df9bb295bb42184 (patch) | |
| tree | 4579c4a4375c8462673ff8250a817efe1077d6c8 /puppet | |
| parent | 1e804d5b2e5324de84772cf45639cdc78d398d35 (diff) | |
| parent | 88b278f510b0c9351c58dfe67513f3902d415ab6 (diff) | |
Merge "Drop swift ceilometer middleware."
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/hieradata/controller.yaml | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index d21b8bc6..3de9bd91 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -48,7 +48,6 @@ swift::proxy::pipeline: - 'tempurl' - 'formpost' - 'staticweb' - - 'ceilometer' - 'authtoken' - 'keystone' - 'proxy-logging' diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 19ed97fb..bc20bad5 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -364,7 +364,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 |