X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fceilometer-collector.yaml;h=97da92e897bf3a8dff4a239af7e186ed8afc0acb;hb=6a1f17154f4c64f7a0b61439781a7c868906d956;hp=53fb47168d8a68893edf6aae2316684aab15a3ca;hpb=e8fdaf13dea1ba84e585f787d1a12b0f24af720e;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/ceilometer-collector.yaml b/puppet/services/pacemaker/ceilometer-collector.yaml
index 53fb4716..97da92e8 100644
--- a/puppet/services/pacemaker/ceilometer-collector.yaml
+++ b/puppet/services/pacemaker/ceilometer-collector.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Ceilometer Collector service with Pacemaker 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
@@ -12,18 +21,21 @@ parameters:
 
 resources:
   CeilometerServiceBase:
-    type: ../ceilometer-base.yaml
+    type: ../ceilometer-collector.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Ceilometer Collector pacemaker role.
     value:
+      service_name: ceilometer_collector
       config_settings:
         map_merge:
           - get_attr: [CeilometerServiceBase, role_data, config_settings]
           - ceilometer::collector::manage_service: false
-          - ceilometer::collector::enabled: false
+            ceilometer::collector::enabled: false
       step_config: |
         include ::tripleo::profile::pacemaker::ceilometer::collector