Remove all broken references to ./puppet/services

We've long moved these service definitions under ./deployment.

Change-Id: I46609facb862cb6451afd8920ae22ae054894178
This commit is contained in:
Rabi Mishra 2020-08-06 08:49:08 +05:30
parent a682f4b25c
commit dc171d2493
3 changed files with 4 additions and 4 deletions

View File

@ -11,4 +11,4 @@ resource_registry:
OS::TripleO::Services::NovaMigrationTargetAlt: ../deployment/nova/nova-migration-target-container-puppet.yaml
OS::TripleO::Services::OVNControllerAlt: OS::Heat::None
# If enabling OVN you'll need provide the following in a specific resource_registry
# OS::TripleO::Services::OVNControllerAlt: ../puppet/services/ovn-controller.yaml
# OS::TripleO::Services::OVNControllerAlt: ../deployment/ovn/ovn-controller-container-puppet.yaml

View File

@ -1,7 +1,7 @@
# A Heat environment that can be used to deploy OVN services with non HA OVN DB servers.
resource_registry:
OS::TripleO::Docker::NeutronMl2PluginBase: ../../deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::OVNController: ../../puppet/services/ovn-controller.yaml
OS::TripleO::Services::OVNController: ../../deployment/ovn/ovn-controller-container-puppet.yaml
OS::TripleO::Services::OVNDBs: ../../deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml
# Disabling Neutron services that overlap with OVN
OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None

View File

@ -247,9 +247,9 @@ VALIDATE_PUPPET_OVERRIDE = {
'./deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml': False,
'./deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml': False,
# qdr aliases rabbitmq service to provide alternative messaging backend
'./puppet/services/qdr.yaml': False,
'./deployment/qdr/qdroutered-container-puppet.yaml': False,
# puppet/services/messaging/*.yaml provide oslo_messaging services
'./puppet/services/messaging/rpc-qdrouterd.yaml': False,
'./deployment/messaging/rpc-qdrouterd-container-puppet.yaml': False,
}
VALIDATE_DOCKER_OVERRIDE = {