aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-23 00:08:28 +0000
committerGerrit Code Review <review@openstack.org>2017-05-23 00:08:28 +0000
commit9a0d017cc74cc8713d3b1d9ae8172e2d7d0611ce (patch)
treedb23e3c487385141eb9e80282760b31a26cd5519 /puppet
parent9bbef9ee4d3f76c2030171c61d3184cbe042793e (diff)
parent780b751601d8704aa81bd9c53359fe17898fe270 (diff)
Merge "Use disabled suffix for disabled service names"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/disabled/ceilometer-collector-disabled.yaml (renamed from puppet/services/disabled/ceilometer-collector.yaml)2
-rw-r--r--puppet/services/disabled/ceilometer-expirer-disabled.yaml (renamed from puppet/services/disabled/ceilometer-expirer.yaml)2
-rw-r--r--puppet/services/disabled/glance-registry-disabled.yaml (renamed from puppet/services/disabled/glance-registry.yaml)2
3 files changed, 3 insertions, 3 deletions
diff --git a/puppet/services/disabled/ceilometer-collector.yaml b/puppet/services/disabled/ceilometer-collector-disabled.yaml
index 64fd476d..18092a8f 100644
--- a/puppet/services/disabled/ceilometer-collector.yaml
+++ b/puppet/services/disabled/ceilometer-collector-disabled.yaml
@@ -31,7 +31,7 @@ outputs:
role_data:
description: Role data for the disabled Ceilometer Collector role.
value:
- service_name: ceilometer_collector
+ service_name: ceilometer_collector_disabled
upgrade_tasks:
- name: Stop and disable ceilometer_collector service on upgrade
tags: step1
diff --git a/puppet/services/disabled/ceilometer-expirer.yaml b/puppet/services/disabled/ceilometer-expirer-disabled.yaml
index 182193ec..e6d8ee6e 100644
--- a/puppet/services/disabled/ceilometer-expirer.yaml
+++ b/puppet/services/disabled/ceilometer-expirer-disabled.yaml
@@ -31,7 +31,7 @@ outputs:
role_data:
description: Role data for the disabled Ceilometer Expirer role.
value:
- service_name: ceilometer_expirer
+ service_name: ceilometer_expirer_disabled
upgrade_tasks:
- name: Stop and disable ceilometer_expirer service on upgrade
tags: step1
diff --git a/puppet/services/disabled/glance-registry.yaml b/puppet/services/disabled/glance-registry-disabled.yaml
index b2cd03ee..85a5c5ef 100644
--- a/puppet/services/disabled/glance-registry.yaml
+++ b/puppet/services/disabled/glance-registry-disabled.yaml
@@ -31,7 +31,7 @@ outputs:
role_data:
description: Role data for the disabled Glance Registry role.
value:
- service_name: glance_registry
+ service_name: glance_registry_disabled
upgrade_tasks:
- name: Stop and disable glance_registry service on upgrade
tags: step1