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
This commit is contained in:
parent
0900c88428
commit
780b751601
|
@ -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
|
||||
|
|
|
@ -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
|
|
@ -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
|
|
@ -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
|
Loading…
Reference in New Issue