summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 21:41:57 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 21:41:57 +0000
commitb9760bc9afdd49af939fd8585ad8c7ee2a6e9897 (patch)
tree1826abf892d99a589a22d2d9f0070180b25b3c79
parentc20e85a3b31c537c98ea3f178f4840744f82d7d4 (diff)
parent32e5fe6cee3e8165bf2730c378d6c4804136104c (diff)
Merge "Add ignore_projects to filter gnocchi events" into stable/ocata
-rw-r--r--puppet/services/swift-proxy.yaml8
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml
index 77f2bdf..b9db81b 100644
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -53,6 +53,10 @@ parameters:
53 description: Set to False to disable the swift proxy ceilometer pipeline. 53 description: Set to False to disable the swift proxy ceilometer pipeline.
54 default: True 54 default: True
55 type: boolean 55 type: boolean
56 SwiftCeilometerIgnoreProjects:
57 default: ['services']
58 description: Comma-seperated list of project names to ignore.
59 type: comma_delimited_list
56 RabbitClientPort: 60 RabbitClientPort:
57 default: 5672 61 default: 5672
58 description: Set rabbit subscriber port, change this if using SSL 62 description: Set rabbit subscriber port, change this if using SSL
@@ -94,6 +98,10 @@ outputs:
94 swift::proxy::workers: {get_param: SwiftWorkers} 98 swift::proxy::workers: {get_param: SwiftWorkers}
95 swift::proxy::ceilometer::rabbit_user: {get_param: RabbitUserName} 99 swift::proxy::ceilometer::rabbit_user: {get_param: RabbitUserName}
96 swift::proxy::ceilometer::rabbit_password: {get_param: RabbitPassword} 100 swift::proxy::ceilometer::rabbit_password: {get_param: RabbitPassword}
101 swift::proxy::ceilometer::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
102 swift::proxy::ceilometer::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
103 swift::proxy::ceilometer::password: {get_param: SwiftPassword}
104 swift::proxy::ceilometer::ignore_projects: {get_param: SwiftCeilometerIgnoreProjects}
97 swift::proxy::staticweb::url_base: {get_param: [EndpointMap, SwiftPublic, uri_no_suffix]} 105 swift::proxy::staticweb::url_base: {get_param: [EndpointMap, SwiftPublic, uri_no_suffix]}
98 swift::proxy::ceilometer::nonblocking_notify: true 106 swift::proxy::ceilometer::nonblocking_notify: true
99 tripleo::profile::base::swift::proxy::rabbit_port: {get_param: RabbitClientPort} 107 tripleo::profile::base::swift::proxy::rabbit_port: {get_param: RabbitClientPort}