diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-21 13:16:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-21 13:16:34 +0000 |
| commit | 6d29fdb36573276646d7a54b327f91e1bf486201 (patch) | |
| tree | b6f01fd5456da4ea760c95b936e4dd108358dad0 /puppet/services | |
| parent | cc79c92b732354dbd5f8faf3c4047d6de6b0c1e1 (diff) | |
| parent | f1b509c8c856532a87b533cebf7ab8430393bf5c (diff) | |
Merge "Include ceilometer in swift proxy pipeline"
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/swift-proxy.yaml | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml index ed0d12cf..de8daea5 100644 --- a/puppet/services/swift-proxy.yaml +++ b/puppet/services/swift-proxy.yaml @@ -41,6 +41,14 @@ parameters: MonitoringSubscriptionSwiftProxy: default: 'overcloud-swift-proxy' type: string + RabbitPassword: + description: The password for RabbitMQ + type: string + hidden: true + RabbitUserName: + default: guest + description: The username for RabbitMQ + type: string resources: SwiftBase: @@ -66,6 +74,9 @@ 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: '122 swift proxy': dport: @@ -77,6 +88,7 @@ outputs: - ResellerAdmin swift::proxy::versioned_writes::allow_versioned_writes: true swift::proxy::pipeline: + - 'ceilometer' - 'catch_errors' - 'healthcheck' - 'proxy-logging' |