X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceilometer-api.yaml;h=b9f021e3be6f6fa1448ca4f4a048e707de5186bf;hb=6d12839f3655f8774ad227bfa4f3cf4d7b45acc5;hp=3e7198f936ea6810dc6dea338ed357d2eb3677a3;hpb=315fa319630fa22ee9e31a058a2a17376b5f1ea3;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceilometer-api.yaml b/puppet/services/ceilometer-api.yaml
index 3e7198f9..b9f021e3 100644
--- a/puppet/services/ceilometer-api.yaml
+++ b/puppet/services/ceilometer-api.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Ceilometer API 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
@@ -15,13 +24,15 @@ resources:
   CeilometerServiceBase:
     type: ./ceilometer-base.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Ceilometer API role.
     value:
-      service_name: ceilometer-api
+      service_name: ceilometer_api
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]