From 780b751601d8704aa81bd9c53359fe17898fe270 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Mon, 22 May 2017 11:32:05 +0300 Subject: 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 --- overcloud-resource-registry-puppet.j2.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'overcloud-resource-registry-puppet.j2.yaml') 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 -- cgit 1.2.3-korg