X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceilometer-expirer.yaml;h=714434b1a41bdce2b35e3c9841e92ddc75728cdc;hb=3243a1ab275648a17c98f47735a4490b59478d1e;hp=06c2ed1283a6d03c59c3199d42d596284d383558;hpb=e8fdaf13dea1ba84e585f787d1a12b0f24af720e;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceilometer-expirer.yaml b/puppet/services/ceilometer-expirer.yaml
index 06c2ed12..714434b1 100644
--- a/puppet/services/ceilometer-expirer.yaml
+++ b/puppet/services/ceilometer-expirer.yaml
@@ -1,27 +1,42 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
-  OpenStack Ceilometer API service configured with Puppet
+  OpenStack Ceilometer Expirer 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
                  via parameter_defaults in the resource registry.
     type: json
-
+  MonitoringSubscriptionCeilometerExpirer:
+    default: 'overcloud-ceilometer-expirer'
+    type: string
 
 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.
+    description: Role data for the Ceilometer Expirer role.
     value:
+      service_name: ceilometer_expirer
+      monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerExpirer}
       config_settings:
         get_attr: [CeilometerServiceBase, role_data, config_settings]
       step_config: |
-        include ::tripleo::profile::base::ceilometer::api
+        include ::tripleo::profile::base::ceilometer::expirer