Merge "Automatically backup and restore Swift rings from the undercloud"

[apex-tripleo-heat-templates.git] / puppet / services / ceilometer-expirer.yaml

diff --git a/puppet/services/ceilometer-expirer.yaml b/puppet/services/ceilometer-expirer.yaml
index 63a6d41..714434b 100644 (file)
--- a/puppet/services/ceilometer-expirer.yaml
+++ b/puppet/services/ceilometer-expirer.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Ceilometer Expirer service configured with Puppet
@@ -18,7 +18,9 @@ parameters:
     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:
@@ -33,6 +35,7 @@ outputs:
     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: |