openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Delete the stale and incorrect ovn environment files"

This commit is contained in:
Zuul 2019-06-06 01:49:06 +00:00 committed by Gerrit Code Review
parent ed90e20699 6454247dd6
commit d4103cf1b1
3 changed files with 7 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
environments/neutron-ml2-ovn-dvr-ha.yaml
View File

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

31
environments/neutron-ml2-ovn-ha.yaml
View File

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

7
releasenotes/notes/deprecated-vn-ha-env-files-f0d967d173dcdb16.yaml Normal file
View File

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