openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix service naming conventions"

This commit is contained in:
Zuul 2018-12-15 02:43:28 +00:00 committed by Gerrit Code Review
parent 45fe78597b bf1c16d48b
commit 1282bc27db
7 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
deployment/aodh/aodh-api-container.yaml → deployment/aodh/aodh-api-container-puppet.yaml
View File

0
deployment/aodh/aodh-evaluator-container.yaml → deployment/aodh/aodh-evaluator-container-puppet.yaml
View File

0
deployment/aodh/aodh-listener-container.yaml → deployment/aodh/aodh-listener-container-puppet.yaml
View File

0
deployment/aodh/aodh-notifier-container.yaml → deployment/aodh/aodh-notifier-container-puppet.yaml
View File

0
deployment/timesync/chrony-ansible.yaml → deployment/timesync/chrony-baremetal-ansible.yaml
View File

8
environments/baremetal-services.yaml
View File

@ -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

10
overcloud-resource-registry-puppet.j2.yaml
View File

@ -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