aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/ceilometer-expirer.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-02 10:00:14 +0000
committerGerrit Code Review <review@openstack.org>2016-09-02 10:00:14 +0000
commitd6837ea4a62ec74c4b06901c257fe4d6f4bea73c (patch)
treef6d252cfb4026674c7133e8b863c5e5f0a9d0ce1 /puppet/services/ceilometer-expirer.yaml
parent3a5d28c4739d3f79c7b10af169f110f9a10f61bb (diff)
parent25ad7b8e1eeeb0e1f5f83b9f7560502717b44536 (diff)
Merge "Availability monitoring agents support"
Diffstat (limited to 'puppet/services/ceilometer-expirer.yaml')
-rw-r--r--puppet/services/ceilometer-expirer.yaml5
1 files changed, 4 insertions, 1 deletions
diff --git a/puppet/services/ceilometer-expirer.yaml b/puppet/services/ceilometer-expirer.yaml
index 63a6d41d..3b811c4d 100644
--- a/puppet/services/ceilometer-expirer.yaml
+++ b/puppet/services/ceilometer-expirer.yaml
@@ -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: |