From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 26 Jul 2017 22:57:25 +0000 (+0000)
Subject: Merge "aodh: add gnocchi_external_project_owner config"
X-Git-Tag: opnfv-6.0.0~332
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d1b8863dd707e3fe207d35fbe3fb51b558ad5b56;hp=895b96e8631a1a323335616ec5e13731f560187c;p=apex-tripleo-heat-templates.git

Merge "aodh: add gnocchi_external_project_owner config"
---

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