X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fgnocchi-metricd.yaml;h=ebdebd1ed4ffbbd3bf3912e0a4e74477d3773804;hb=9d67d7b3b11b688be0b40fc2fcfb1daf5b5157df;hp=8041c6f4876fefee6e171566fae5dc71c2ac35aa;hpb=73656aac0dbf1e0bbc8ee10cf5f282c93af4174b;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/gnocchi-metricd.yaml b/puppet/services/gnocchi-metricd.yaml
index 8041c6f4..ebdebd1e 100644
--- a/puppet/services/gnocchi-metricd.yaml
+++ b/puppet/services/gnocchi-metricd.yaml
@@ -4,16 +4,30 @@ description: >
   Gnocchi service configured with Puppet
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  MonitoringSubscriptionGnocchiMetricd:
+    default: 'overcloud-gnocchi-metricd'
+    type: string
 
 resources:
   GnocchiServiceBase:
     type: ./gnocchi-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -21,9 +35,9 @@ outputs:
     description: Role data for the Gnocchi role.
     value:
       service_name: gnocchi_metricd
+      monitoring_subscription: {get_param: MonitoringSubscriptionGnocchiMetricd}
       config_settings:
         map_merge:
           - get_attr: [GnocchiServiceBase, role_data, config_settings]
-          - gnocchi::metricd::manage_service: false
       step_config: |
         include ::tripleo::profile::base::gnocchi::metricd