X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fgnocchi-statsd.yaml;h=018ad2b13fb5039ba036c8dcc049c3f13386b395;hb=685c1e7de0c5a37d6f11eeb9bceaa74b0a2e923a;hp=4fef7af6e18cf0c0d441832e51ac14a5722e5cde;hpb=f00ed98048a1a24e55dfea64171771ff73216335;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/gnocchi-statsd.yaml b/puppet/services/gnocchi-statsd.yaml
index 4fef7af6..018ad2b1 100644
--- a/puppet/services/gnocchi-statsd.yaml
+++ b/puppet/services/gnocchi-statsd.yaml
@@ -4,6 +4,15 @@ 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
@@ -14,16 +23,17 @@ resources:
   GnocchiServiceBase:
     type: ./gnocchi-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Gnocchi role.
     value:
-      service_name: gnocchi-statsd
+      service_name: gnocchi_statsd
       config_settings:
         map_merge:
           - get_attr: [GnocchiServiceBase, role_data, config_settings]
-          - gnocchi::statsd::manage_service: false
       step_config: |
         include ::tripleo::profile::base::gnocchi::statsd