From afcd787deb0223bf875183bdcc8160e76c2e7af2 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Sun, 28 Jul 2019 20:26:40 +0530 Subject: [PATCH] Change NeutronMechanismDrivers in ml2-ansible environments This should have been done when we moved to ovn as the default. Note: Not sure why we maintain two different environments. Probably should remove one in a subsequent patch. Change-Id: I8a20ce8785077824d7e6c8d851716f622e77788f Closes-Bug: #1838196 --- environments/neutron-ml2-ansible.yaml | 4 ++-- environments/services/neutron-ml2-ansible.yaml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/environments/neutron-ml2-ansible.yaml b/environments/neutron-ml2-ansible.yaml index 5d3f45d553..a16653b676 100644 --- a/environments/neutron-ml2-ansible.yaml +++ b/environments/neutron-ml2-ansible.yaml @@ -4,6 +4,6 @@ resource_registry: parameter_defaults: IronicDefaultNetworkInterface: neutron - NeutronMechanismDrivers: openvswitch,ansible - NeutronTypeDrivers: local,vxlan,vlan,flat + NeutronMechanismDrivers: ovn,ansible + NeutronTypeDrivers: local,geneve,vlan,flat NeutronNetworkType: vlan diff --git a/environments/services/neutron-ml2-ansible.yaml b/environments/services/neutron-ml2-ansible.yaml index e40f047893..bb832649ae 100644 --- a/environments/services/neutron-ml2-ansible.yaml +++ b/environments/services/neutron-ml2-ansible.yaml @@ -1,8 +1,9 @@ # A Heat environment file which can be used to enable network-ansible ML2 mechanism driver resource_registry: OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginML2Ansible + parameter_defaults: IronicDefaultNetworkInterface: neutron - NeutronMechanismDrivers: openvswitch,ansible - NeutronTypeDrivers: local,vxlan,vlan,flat + NeutronMechanismDrivers: ovn,ansible + NeutronTypeDrivers: local,geneve,vlan,flat NeutronNetworkType: vlan