HPELeftHandISCSIDriver support for Cinder

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

diff --git a/puppet/services/ceilometer-agent-compute.yaml b/puppet/services/ceilometer-agent-compute.yaml
index 5bfecfe..b1d36c9 100644 (file)
--- a/puppet/services/ceilometer-agent-compute.yaml
+++ b/puppet/services/ceilometer-agent-compute.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: ocata
 
 description: >
   OpenStack Ceilometer Compute Agent service configured with Puppet
@@ -18,6 +18,9 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  MonitoringSubscriptionCeilometerCompute:
+    default: 'overcloud-ceilometer-agent-compute'
+    type: string
 
 resources:
   CeilometerServiceBase:
@@ -32,6 +35,7 @@ outputs:
     description: Role data for the Ceilometer Compute Agent role.
     value:
       service_name: ceilometer_agent_compute
+      monitoring_subscription: {get_param: MonitoringSubscriptionCeilometerCompute}
       config_settings:
         get_attr: [CeilometerServiceBase, role_data, config_settings]
       step_config: |