summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMehdi Abaakouk <sileht@sileht.net>2017-07-18 16:16:51 +0200
committerPradeep Kilambi <pkilambi@redhat.com>2017-07-18 17:50:45 +0000
commitfe72598d9c5b594747060b4f2c12a34a92d6eb6d (patch)
tree45f10a83daffaf752cbf133f9dfb31e56c182901
parent7e4f7dd2b0324247bba8fd8da5f3becd20e8299f (diff)
aodh: add gnocchi_external_project_owner config
gnocchi_external_project_owner is to configure who creates resources and metrics in Gnocchi (usually Ceilometer). So Aodh can create the right rbac rules. So the project name is 'service' for tripleo. We can't use the default set because puppet always uses 'services' and not 'service'. Change-Id: I6f7acc3a4cab29bc566d7becdc93ba3393f5c8fe
-rw-r--r--puppet/services/aodh-api.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/aodh-api.yaml b/puppet/services/aodh-api.yaml
index d9b61ccd..f84edde0 100644
--- a/puppet/services/aodh-api.yaml
+++ b/puppet/services/aodh-api.yaml
@@ -30,6 +30,10 @@ parameters:
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
+ GnocchiExternalProject:
+ default: 'service'
+ description: Project name of resources creator in Gnocchi.
+ type: string
MonitoringSubscriptionAodhApi:
default: 'overcloud-ceilometer-aodh-api'
type: string
@@ -85,6 +89,7 @@ outputs:
aodh::wsgi::apache::wsgi_process_display_name: 'aodh_wsgi'
aodh::api::service_name: 'httpd'
aodh::api::enable_proxy_headers_parsing: true
+ aodh::api::gnocchi_external_project_owner: {get_param: GnocchiExternalProject}
aodh::policy::policies: {get_param: AodhApiPolicies}
tripleo.aodh_api.firewall_rules:
'128 aodh-api':