From: Mehdi Abaakouk <sileht@sileht.net>
Date: Tue, 18 Jul 2017 14:16:51 +0000 (+0200)
Subject: aodh: add gnocchi_external_project_owner config
X-Git-Tag: opnfv-6.0.0~332^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fe72598d9c5b594747060b4f2c12a34a92d6eb6d;p=apex-tripleo-heat-templates.git

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
---

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':