diff --git a/environments/neutron-ml2-ovn-dvr-ha.yaml b/environments/neutron-ml2-ovn-dvr-ha.yaml deleted file mode 100644 index a3e7d79e87..0000000000 --- a/environments/neutron-ml2-ovn-dvr-ha.yaml +++ /dev/null @@ -1,29 +0,0 @@ -# A Heat environment file which can be used to enable OVN -# extensions, configured via docker -resource_registry: - OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN - OS::TripleO::Services::OVNController: ../docker/services/ovn-controller.yaml - OS::TripleO::Services::OVNDBs: ../docker/services/pacemaker/ovn-dbs.yaml -# Disabling Neutron services that overlap with OVN - OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None - OS::TripleO::Services::NeutronL3Agent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronL3Agent: OS::Heat::None - OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronMetadataAgent: OS::Heat::None - OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None - -parameter_defaults: - NeutronMechanismDrivers: ovn - OVNVifType: ovs - OVNNeutronSyncMode: log - OVNQosDriver: ovn-qos - OVNTunnelEncapType: geneve - NeutronTypeDrivers: 'geneve,vlan,flat' - NeutronNetworkType: 'geneve' - NeutronServicePlugins: 'qos,ovn-router,trunk' - NeutronVniRanges: ['1:65536', ] - NeutronEnableDVR: true - KernelIpNonLocalBind: 1 - diff --git a/environments/neutron-ml2-ovn-ha.yaml b/environments/neutron-ml2-ovn-ha.yaml deleted file mode 100644 index cc9f41cfbc..0000000000 --- a/environments/neutron-ml2-ovn-ha.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# A Heat environment file which can be used to enable OVN -# extensions, configured via docker -resource_registry: - OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2OVN - OS::TripleO::Services::OVNController: ../deployment/ovn/ovn-controller-container-puppet.yaml - OS::TripleO::Services::OVNDBs: ../deployment/ovn/ovn-dbs-pacemaker-puppet.yaml - OS::TripleO::Services::OVNMetadataAgent: ../deployment/ovn/ovn-metadata-container-puppet.yaml -# Disabling Neutron services that overlap with OVN - OS::TripleO::Services::NeutronOvsAgent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None - OS::TripleO::Services::NeutronL3Agent: OS::Heat::None - OS::TripleO::Services::NeutronMetadataAgent: OS::Heat::None - OS::TripleO::Services::NeutronDhcpAgent: OS::Heat::None - OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None - -parameter_defaults: - NeutronMechanismDrivers: ovn - OVNVifType: ovs - OVNNeutronSyncMode: log - OVNQosDriver: ovn-qos - OVNTunnelEncapType: geneve - NeutronTypeDrivers: 'geneve,vlan,flat' - NeutronNetworkType: ['geneve', 'vlan', 'flat'] - NeutronServicePlugins: 'qos,ovn-router,trunk' - NeutronVniRanges: ['1:65536', ] - - ComputeParameters: - NeutronBridgeMappings: "" - NetworkerParameters: - OVNCMSOptions: "enable-chassis-as-gw" - KernelIpNonLocalBind: 1 diff --git a/releasenotes/notes/deprecated-vn-ha-env-files-f0d967d173dcdb16.yaml b/releasenotes/notes/deprecated-vn-ha-env-files-f0d967d173dcdb16.yaml new file mode 100644 index 0000000000..d93a58b5c6 --- /dev/null +++ b/releasenotes/notes/deprecated-vn-ha-env-files-f0d967d173dcdb16.yaml @@ -0,0 +1,7 @@ +--- +deprecations: + - | + The following files are removed (environments/neutron-ml2-ovn-dvr-ha.yaml + and environments/neutron-ml2-ovn-ha.yaml). The reason for this is that + the maintained versions are kept under environment/services and to avoid + confusion we remove the unmaintained ones.