diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-06-16 21:41:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-06-16 21:41:57 +0000 |
| commit | b9760bc9afdd49af939fd8585ad8c7ee2a6e9897 (patch) | |
| tree | 1826abf892d99a589a22d2d9f0070180b25b3c79 | |
| parent | c20e85a3b31c537c98ea3f178f4840744f82d7d4 (diff) | |
| parent | 32e5fe6cee3e8165bf2730c378d6c4804136104c (diff) | |
Merge "Add ignore_projects to filter gnocchi events" into stable/ocata
| -rw-r--r-- | puppet/services/swift-proxy.yaml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml index 77f2bdfa..b9db81b0 100644 --- a/puppet/services/swift-proxy.yaml +++ b/puppet/services/swift-proxy.yaml @@ -53,6 +53,10 @@ parameters: description: Set to False to disable the swift proxy ceilometer pipeline. default: True type: boolean + SwiftCeilometerIgnoreProjects: + default: ['services'] + description: Comma-seperated list of project names to ignore. + type: comma_delimited_list RabbitClientPort: default: 5672 description: Set rabbit subscriber port, change this if using SSL @@ -94,6 +98,10 @@ outputs: swift::proxy::workers: {get_param: SwiftWorkers} swift::proxy::ceilometer::rabbit_user: {get_param: RabbitUserName} swift::proxy::ceilometer::rabbit_password: {get_param: RabbitPassword} + swift::proxy::ceilometer::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]} + swift::proxy::ceilometer::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} + swift::proxy::ceilometer::password: {get_param: SwiftPassword} + swift::proxy::ceilometer::ignore_projects: {get_param: SwiftCeilometerIgnoreProjects} swift::proxy::staticweb::url_base: {get_param: [EndpointMap, SwiftPublic, uri_no_suffix]} swift::proxy::ceilometer::nonblocking_notify: true tripleo::profile::base::swift::proxy::rabbit_port: {get_param: RabbitClientPort} |