diff options
| author |   Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2017-05-22 11:32:05 +0300 |
|---|---|---|
| committer | Juan Antonio Osorio Robles <jaosorior@redhat.com> | 2017-05-22 11:32:05 +0300 |
| commit | 780b751601d8704aa81bd9c53359fe17898fe270 (patch) | |
| tree | 5900fa4af729892fa7dc8b96cfdee4643588d950 | |
| parent | 0900c884281dc73dd3eccbb9ae9ea58efe5487ba (diff) | |
Use disabled suffix for disabled service names
This changes both the service names and the file names for disabled
services, adding the 'disabled' suffix to them.
This comes with the reasoning that, if a service requires a disabled
service, and checks for the name in the "service_names" hiera entry, it
will appear as if the service was enabled, when it's actually not. So
changing the name and using this convention prevents that issue.
Change-Id: I308d6680a4d9b526f22ba0d7d20e5db638aadb9a
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 6 | ||||
| -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 |
4 files changed, 6 insertions, 6 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 7b8fe234..51be5644 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -124,7 +124,7 @@ resource_registry: OS::TripleO::Services::Congress: OS::Heat::None OS::TripleO::Services::Keystone: puppet/services/keystone.yaml OS::TripleO::Services::GlanceApi: puppet/services/glance-api.yaml - OS::TripleO::Services::GlanceRegistry: puppet/services/disabled/glance-registry.yaml + OS::TripleO::Services::GlanceRegistry: puppet/services/disabled/glance-registry-disabled.yaml OS::TripleO::Services::HeatApi: puppet/services/heat-api.yaml OS::TripleO::Services::HeatApiCfn: puppet/services/heat-api-cfn.yaml OS::TripleO::Services::HeatApiCloudwatch: puppet/services/heat-api-cloudwatch.yaml @@ -189,8 +189,8 @@ resource_registry: OS::TripleO::Services::Tacker: OS::Heat::None OS::TripleO::Services::Timezone: puppet/services/time/timezone.yaml OS::TripleO::Services::CeilometerApi: puppet/services/ceilometer-api.yaml - OS::TripleO::Services::CeilometerCollector: puppet/services/disabled/ceilometer-collector.yaml - OS::TripleO::Services::CeilometerExpirer: puppet/services/disabled/ceilometer-expirer.yaml + OS::TripleO::Services::CeilometerCollector: puppet/services/disabled/ceilometer-collector-disabled.yaml + OS::TripleO::Services::CeilometerExpirer: puppet/services/disabled/ceilometer-expirer-disabled.yaml OS::TripleO::Services::CeilometerAgentCentral: puppet/services/ceilometer-agent-central.yaml OS::TripleO::Services::CeilometerAgentNotification: puppet/services/ceilometer-agent-notification.yaml OS::TripleO::Services::ComputeCeilometerAgent: puppet/services/ceilometer-agent-compute.yaml 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 |