summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPradeep Kilambi <pkilambi@redhat.com>2017-05-23 10:41:22 -0400
committerPradeep Kilambi <pkilambi@redhat.com>2017-06-15 14:36:58 -0400
commit40cdd83ef5d0be7dabc0c6ce8c95045c0f7389e5 (patch)
treeb5f6f349d4dd5c70cb2d6e497ab36d52ac49bdaf
parent882ed99b0c02129dee053ed16fa7b42829780b6b (diff)
Add ignore_projects to filter gnocchi events
Without this, ceilometer db gets hammered with gnocchi swift events. Keystone creds are required so middleware can query for id. Related change: I5c0f4f1a2c7fe7eb39ea6441970e9ac0946a4ec1 Change-Id: I9a7a80252703e470a69dc10352e7ece45ab23150 (cherry picked from commit 37447494de7380409f4461835a2b1882ead37985)
Notes
Notes (review): Code-Review+2: Alex Schultz <aschultz@redhat.com> Workflow+1: Alex Schultz <aschultz@redhat.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Fri, 16 Jun 2017 02:30:09 +0000 Reviewed-on: https://review.openstack.org/474725 Project: openstack/tripleo-heat-templates Branch: refs/heads/stable/newton
-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 ba1d99f..1a1262f 100644
--- a/puppet/services/swift-proxy.yaml
+++ b/puppet/services/swift-proxy.yaml
@@ -49,6 +49,10 @@ parameters:
49 default: guest 49 default: guest
50 description: The username for RabbitMQ 50 description: The username for RabbitMQ
51 type: string 51 type: string
52 SwiftCeilometerIgnoreProjects:
53 default: ['services']
54 description: Comma-seperated list of project names to ignore.
55 type: comma_delimited_list
52 56
53resources: 57resources:
54 SwiftBase: 58 SwiftBase:
@@ -76,6 +80,10 @@ outputs:
76 swift::proxy::workers: {get_param: SwiftWorkers} 80 swift::proxy::workers: {get_param: SwiftWorkers}
77 swift::proxy::ceilometer::rabbit_user: {get_param: RabbitUserName} 81 swift::proxy::ceilometer::rabbit_user: {get_param: RabbitUserName}
78 swift::proxy::ceilometer::rabbit_password: {get_param: RabbitPassword} 82 swift::proxy::ceilometer::rabbit_password: {get_param: RabbitPassword}
83 swift::proxy::ceilometer::auth_uri: {get_param: [EndpointMap, KeystoneInternal, uri]}
84 swift::proxy::ceilometer::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
85 swift::proxy::ceilometer::password: {get_param: SwiftPassword}
86 swift::proxy::ceilometer::ignore_projects: {get_param: SwiftCeilometerIgnoreProjects}
79 swift::proxy::staticweb::url_base: {get_param: [EndpointMap, SwiftPublic, uri_no_suffix]} 87 swift::proxy::staticweb::url_base: {get_param: [EndpointMap, SwiftPublic, uri_no_suffix]}
80 tripleo.swift_proxy.firewall_rules: 88 tripleo.swift_proxy.firewall_rules:
81 '122 swift proxy': 89 '122 swift proxy':