From 3dd682a3e5840d8f711e656bd1609416088f1d2f Mon Sep 17 00:00:00 2001 From: Slawek Kaplonski Date: Thu, 5 Sep 2024 12:22:38 +0200 Subject: [PATCH] Add 'local' network type in the Control Plane CRs Lack of this 'local' network type breaks somehow some Horizon integration tests as this is first choice in the Horizon UI. From Neutron PoV there is no reason not to load this driver so lets enable that driver in the Neutron's config. (cherry picked from commit 82b8592168adfb64784544991b22601502289343) --- examples/dt/uni01alpha/control-plane/service-values.yaml | 2 +- examples/dt/uni04delta-ipv6/control-plane/service-values.yaml | 2 +- examples/dt/uni04delta/control-plane/service-values.yaml | 2 +- examples/dt/uni06zeta/control-plane/service-values.yaml | 2 +- examples/dt/uni07eta/control-plane/service-values.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/dt/uni01alpha/control-plane/service-values.yaml b/examples/dt/uni01alpha/control-plane/service-values.yaml index 392047fb7..636d6eafc 100644 --- a/examples/dt/uni01alpha/control-plane/service-values.yaml +++ b/examples/dt/uni01alpha/control-plane/service-values.yaml @@ -173,5 +173,5 @@ data: ovn_emit_need_to_frag = true [ml2] - type_drivers = geneve,vxlan,vlan,flat + type_drivers = geneve,vxlan,vlan,flat,local tenant_network_types = geneve,flat diff --git a/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml b/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml index e88d74be7..5e933b22d 100644 --- a/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml +++ b/examples/dt/uni04delta-ipv6/control-plane/service-values.yaml @@ -100,7 +100,7 @@ data: [ovn] ovn_emit_need_to_frag = false [ml2] - type_drivers = geneve,vlan,flat + type_drivers = geneve,vlan,flat,local tenant_network_types = vlan,flat [ml2_type_vlan] network_vlan_ranges = datacentre:1000:2000 diff --git a/examples/dt/uni04delta/control-plane/service-values.yaml b/examples/dt/uni04delta/control-plane/service-values.yaml index 01fd1c5a1..11bb90976 100644 --- a/examples/dt/uni04delta/control-plane/service-values.yaml +++ b/examples/dt/uni04delta/control-plane/service-values.yaml @@ -101,7 +101,7 @@ data: [ovn] ovn_emit_need_to_frag = true [ml2] - type_drivers = geneve,vlan,flat + type_drivers = geneve,vlan,flat,local tenant_network_types = vlan,flat [ml2_type_vlan] network_vlan_ranges = datacentre:1000:2000 diff --git a/examples/dt/uni06zeta/control-plane/service-values.yaml b/examples/dt/uni06zeta/control-plane/service-values.yaml index 2a8719c81..0b4c5f17e 100644 --- a/examples/dt/uni06zeta/control-plane/service-values.yaml +++ b/examples/dt/uni06zeta/control-plane/service-values.yaml @@ -133,7 +133,7 @@ data: ovn_emit_need_to_frag = true enable_distributed_floating_ip = false [ml2] - type_drivers = geneve,vlan,flat + type_drivers = geneve,vlan,flat,local tenant_network_types = geneve,vlan extension_drivers = qos,port_security,dns_domain_ports path_mtu = 1400 diff --git a/examples/dt/uni07eta/control-plane/service-values.yaml b/examples/dt/uni07eta/control-plane/service-values.yaml index 56fc03edd..b4da8d2fb 100644 --- a/examples/dt/uni07eta/control-plane/service-values.yaml +++ b/examples/dt/uni07eta/control-plane/service-values.yaml @@ -125,6 +125,6 @@ data: ovn_emit_need_to_frag = true [ml2] - type_drivers = geneve,vxlan,vlan,flat + type_drivers = geneve,vxlan,vlan,flat,local tenant_network_types = geneve,flat,vlan path_mtu = 1400