summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-11-05 16:55:26 +0000
committerGerrit Code Review <review@openstack.org>2016-11-05 16:55:26 +0000
commit8d513449193be9a25ee6aad94fc7cf6a257a2457 (patch)
tree02cb29385f2bf59d9142ce91c395af694927e915 /puppet/services
parentd0c9a86b3ba72d26f8eaf131082b61b32cd61c00 (diff)
parenta560e988742c38aa328c8b683fca5be042b4820e (diff)
Merge "swift/proxy: remove swift::proxy::ceilometer::rabbit_host"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/swift-proxy.yaml1
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index 35e21181..ae265448 100644
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -74,7 +74,6 @@ outputs:
swift::proxy::authtoken::project_name: 'service'
swift::proxy::node_timeout: {get_param: SwiftProxyNodeTimeout}
swift::proxy::workers: {get_param: SwiftWorkers}
- swift::proxy::ceilometer::rabbit_host: {get_param: [ServiceNetMap, RabbitmqNetwork]}
swift::proxy::ceilometer::rabbit_user: {get_param: RabbitUserName}
swift::proxy::ceilometer::rabbit_password: {get_param: RabbitPassword}
tripleo.swift_proxy.firewall_rules: