X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceilometer-agent-notification.yaml;h=7873706d4a18c7a9bc8ce3a53a3283298f703f97;hb=5d13a6397c4dccc78dc13c4bf23d651485868904;hp=b65e189bcf63661cc682353a97f677b1237e83b6;hpb=fcf132079f5120d3eed6a786bd3dfa9ab87d3a3a;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceilometer-agent-notification.yaml b/puppet/services/ceilometer-agent-notification.yaml
index b65e189b..7873706d 100644
--- a/puppet/services/ceilometer-agent-notification.yaml
+++ b/puppet/services/ceilometer-agent-notification.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Ceilometer Notification Agent 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 Notification Agent role.
     value:
-      service_name: ceilometer-agent-notification
+      service_name: ceilometer_agent_notification
       config_settings:
         get_attr: [CeilometerServiceBase, role_data, config_settings]
       step_config: |