From bf1c16d48b7209512b9e74236f7474368822ffa6 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 13 Dec 2018 08:09:55 -0700 Subject: [PATCH] Fix service naming conventions We want to include the way the service is deployed (container/baremetal) and the configuration management tool used (ansible/puppet) in the service file name so folks can easily identify how a service is being deployed and with what tooling. Change-Id: Id884009131ea1587042a8ac01eec7afd83d7eb6a Related-Blueprint: services-yaml-flattening --- ...i-container.yaml => aodh-api-container-puppet.yaml} | 0 ...ainer.yaml => aodh-evaluator-container-puppet.yaml} | 0 ...tainer.yaml => aodh-listener-container-puppet.yaml} | 0 ...tainer.yaml => aodh-notifier-container-puppet.yaml} | 0 ...rony-ansible.yaml => chrony-baremetal-ansible.yaml} | 0 environments/baremetal-services.yaml | 8 ++++---- overcloud-resource-registry-puppet.j2.yaml | 10 +++++----- 7 files changed, 9 insertions(+), 9 deletions(-) rename deployment/aodh/{aodh-api-container.yaml => aodh-api-container-puppet.yaml} (100%) rename deployment/aodh/{aodh-evaluator-container.yaml => aodh-evaluator-container-puppet.yaml} (100%) rename deployment/aodh/{aodh-listener-container.yaml => aodh-listener-container-puppet.yaml} (100%) rename deployment/aodh/{aodh-notifier-container.yaml => aodh-notifier-container-puppet.yaml} (100%) rename deployment/timesync/{chrony-ansible.yaml => chrony-baremetal-ansible.yaml} (100%) diff --git a/deployment/aodh/aodh-api-container.yaml b/deployment/aodh/aodh-api-container-puppet.yaml similarity index 100% rename from deployment/aodh/aodh-api-container.yaml rename to deployment/aodh/aodh-api-container-puppet.yaml diff --git a/deployment/aodh/aodh-evaluator-container.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml similarity index 100% rename from deployment/aodh/aodh-evaluator-container.yaml rename to deployment/aodh/aodh-evaluator-container-puppet.yaml diff --git a/deployment/aodh/aodh-listener-container.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml similarity index 100% rename from deployment/aodh/aodh-listener-container.yaml rename to deployment/aodh/aodh-listener-container-puppet.yaml diff --git a/deployment/aodh/aodh-notifier-container.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml similarity index 100% rename from deployment/aodh/aodh-notifier-container.yaml rename to deployment/aodh/aodh-notifier-container-puppet.yaml diff --git a/deployment/timesync/chrony-ansible.yaml b/deployment/timesync/chrony-baremetal-ansible.yaml similarity index 100% rename from deployment/timesync/chrony-ansible.yaml rename to deployment/timesync/chrony-baremetal-ansible.yaml diff --git a/environments/baremetal-services.yaml b/environments/baremetal-services.yaml index 05ff6d17c7..bcf676452a 100644 --- a/environments/baremetal-services.yaml +++ b/environments/baremetal-services.yaml @@ -2,10 +2,10 @@ resource_registry: OS::TripleO::Services::Docker: OS::Heat::None OS::TripleO::Docker::NeutronMl2PluginBase: OS::Heat::None - OS::TripleO::Services::AodhApi: ../deployment/aodh/aodh-api-container.yaml - OS::TripleO::Services::AodhEvaluator: ../deployment/aodh/aodh-evaluator-container.yaml - OS::TripleO::Services::AodhNotifier: ../deployment/aodh/aodh-notifier-container.yaml - OS::TripleO::Services::AodhListener: ../deployment/aodh/aodh-listener-container.yaml + OS::TripleO::Services::AodhApi: ../deployment/aodh/aodh-api-container-puppet.yaml + OS::TripleO::Services::AodhEvaluator: ../deployment/aodh/aodh-evaluator-container-puppet.yaml + OS::TripleO::Services::AodhNotifier: ../deployment/aodh/aodh-notifier-container-puppet.yaml + OS::TripleO::Services::AodhListener: ../deployment/aodh/aodh-listener-container-puppet.yaml OS::TripleO::Services::BlockStorageCinderVolume: ../puppet/services/cinder-volume.yaml OS::TripleO::Services::CeilometerAgentCentral: ../puppet/services/ceilometer-agent-central.yaml OS::TripleO::Services::CeilometerAgentIpmi: ../puppet/services/ceilometer-agent-ipmi.yaml diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 46022ef6e2..f5f60542b5 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -230,7 +230,7 @@ resource_registry: OS::TripleO::Services::Xinetd: docker/services/xinetd.yaml # Time sync services - OS::TripleO::Services::Chrony: deployment/timesync/chrony-ansible.yaml + OS::TripleO::Services::Chrony: deployment/timesync/chrony-baremetal-ansible.yaml OS::TripleO::Services::Ntp: puppet/services/time/ntp.yaml OS::TripleO::Services::Ptp: OS::Heat::None OS::TripleO::Services::Timesync: OS::TripleO::Services::Chrony @@ -261,10 +261,10 @@ resource_registry: OS::TripleO::Services::BarbicanBackendDogtag: OS::Heat::None OS::TripleO::Services::BarbicanBackendKmip: OS::Heat::None OS::TripleO::Services::BarbicanBackendPkcs11Crypto: OS::Heat::None - OS::TripleO::Services::AodhApi: deployment/aodh/aodh-api-container.yaml - OS::TripleO::Services::AodhEvaluator: deployment/aodh/aodh-evaluator-container.yaml - OS::TripleO::Services::AodhListener: deployment/aodh/aodh-listener-container.yaml - OS::TripleO::Services::AodhNotifier: deployment/aodh/aodh-notifier-container.yaml + OS::TripleO::Services::AodhApi: deployment/aodh/aodh-api-container-puppet.yaml + OS::TripleO::Services::AodhEvaluator: deployment/aodh/aodh-evaluator-container-puppet.yaml + OS::TripleO::Services::AodhListener: deployment/aodh/aodh-listener-container-puppet.yaml + OS::TripleO::Services::AodhNotifier: deployment/aodh/aodh-notifier-container-puppet.yaml OS::TripleO::Services::PankoApi: docker/services/panko-api.yaml OS::TripleO::Services::MetricsQdr: OS::Heat::None OS::TripleO::Services::MistralEngine: OS::Heat::None