openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove unused NeutronCorePluginML2OVN service"

This commit is contained in:
Zuul 2022-10-25 03:56:17 +00:00 committed by Gerrit Code Review
parent 9c029370cb d852952ec5
commit d90f342ab4
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/environments/scenario000-standalone.yaml
View File

@ -103,7 +103,6 @@ resource_registry:
OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginML2Ansible: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginML2OVN: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginVTS: OS::Heat::None
OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None

1
environments/disable-neutron.yaml
View File

@ -7,7 +7,6 @@ resource_registry:
OS::TripleO::Services::NeutronBgpVpnApi: OS::Heat::None
OS::TripleO::Services::NeutronBgpVpnBagpipe: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginML2Ansible: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginML2OVN: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginMLNXSDN: OS::Heat::None
OS::TripleO::Services::NeutronCorePlugin: OS::Heat::None
OS::TripleO::Services::NeutronCorePluginVTS: OS::Heat::None

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

@ -137,7 +137,6 @@ resource_registry:
# things where VMs run
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
# Neutron Core Plugin Vendors (these typically override NeutronCorePlugin)
OS::TripleO::Services::NeutronCorePluginML2OVN: deployment/neutron/neutron-plugin-ml2-ovn.yaml
OS::TripleO::Services::OVNDBs: deployment/ovn/ovn-dbs-cluster-ansible.yaml
OS::TripleO::Services::OVNController: deployment/ovn/ovn-controller-container-puppet.yaml
OS::TripleO::Services::OvsDpdkNetcontrold: OS::Heat::None

6
releasenotes/notes/remove-NeutronCorePluginML2OVN-8641be21f069c1bd.yaml Normal file
View File

@ -0,0 +1,6 @@
---
upgrade:
- |
The ``OS::TripleO::Services::NeutronCorePluginML2OVN`` service should be
removed from roles data during upgrade, because the service has been
removed.