X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceilometer-collector.yaml;h=9dbb27598495a97efd8ef223291c326f4e49f2b3;hb=d6837ea4a62ec74c4b06901c257fe4d6f4bea73c;hp=e9811cf97ce3f6a28a64fa4b8a83339afb45dc51;hpb=885b37c80ecdae308289cc2e5c2a29dc66710487;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceilometer-collector.yaml b/puppet/services/ceilometer-collector.yaml
index e9811cf9..9dbb2759 100644
--- a/puppet/services/ceilometer-collector.yaml
+++ b/puppet/services/ceilometer-collector.yaml
@@ -10,17 +10,24 @@ parameters:
                  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
+  MonitoringSubscriptionCeilometerCollector:
+    default: 'overcloud-ceilometer-collector'
+    type: string
 
 resources:
   CeilometerServiceBase:
     type: ./ceilometer-base.yaml
     properties:
       ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
@@ -28,6 +35,7 @@ outputs:
     description: Role data for the Ceilometer Collector role.
     value:
       service_name: ceilometer_collector
+      monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerCollector}
       config_settings:
         get_attr: [CeilometerServiceBase, role_data, config_settings]
       step_config: |