From 0537dc47fac176a871e6e65f357a6730003abc32 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 3 Oct 2024 08:56:03 +0200 Subject: [PATCH] Use geneve instead of vxlan when OVN is enabled Change-Id: Id3e4e7ca285a94e7270eb4850c66e9094782f841 --- ansible/inventory/group_vars/all/neutron | 4 ++-- .../neutron-use-geneve-with-ovn-4d739c90b1aaa3eb.yaml | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/neutron-use-geneve-with-ovn-4d739c90b1aaa3eb.yaml diff --git a/ansible/inventory/group_vars/all/neutron b/ansible/inventory/group_vars/all/neutron index cf1c47944..acd1e4830 100644 --- a/ansible/inventory/group_vars/all/neutron +++ b/ansible/inventory/group_vars/all/neutron @@ -10,13 +10,13 @@ kolla_neutron_ml2_mechanism_drivers: kolla_neutron_ml2_type_drivers: - flat - vlan - - vxlan + - "{{ 'geneve' if kolla_enable_ovn | bool else 'vxlan' }}" # List of Neutron ML2 tenant network types to use. kolla_neutron_ml2_tenant_network_types: - flat - vlan - - vxlan + - "{{ 'geneve' if kolla_enable_ovn | bool else 'vxlan' }}" # List of Neutron ML2 network VLAN ranges to use. Each item should be a dict # containing the following items: diff --git a/releasenotes/notes/neutron-use-geneve-with-ovn-4d739c90b1aaa3eb.yaml b/releasenotes/notes/neutron-use-geneve-with-ovn-4d739c90b1aaa3eb.yaml new file mode 100644 index 000000000..e0cf42b26 --- /dev/null +++ b/releasenotes/notes/neutron-use-geneve-with-ovn-4d739c90b1aaa3eb.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + Updates the default Neutron ML2 type drivers and tenant network types to + use ``geneve`` instead of ``vxlan`` when OVN is enabled. This affects the + ``kolla_neutron_ml2_type_drivers`` and + ``kolla_neutron_ml2_tenant_network_types`` variables.