From 43bd3fa2461b1cadcce9351747dc45c29c1013b7 Mon Sep 17 00:00:00 2001
From: Daniel Speichert <Daniel_Speichert@comcast.com>
Date: Fri, 8 Oct 2021 12:41:19 -0400
Subject: [PATCH] Fix OVN driver validating Geneve max_header_size
Driver was accessing config groups that were not loaded.
Related commit: dc4a57d96661fcb56ff916cafbbbdc683653e9c4
Closes-bug: #1946510
Change-Id: Ib53219c9f6efff828b5bbf7553c356ee2cd4546d
---
neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py b/neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py
index 56d2b777f85..1045c8e53ce 100644
--- a/neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py
+++ b/neutron/plugins/ml2/drivers/ovn/mech_driver/mech_driver.py
@@ -120,7 +120,8 @@ class OVNMechanismDriver(api.MechanismDriver):
self._post_fork_event = threading.Event()
if cfg.CONF.SECURITYGROUP.firewall_driver:
LOG.warning('Firewall driver configuration is ignored')
- if (cfg.CONF.ml2_type_geneve.max_header_size <
+ if (const.TYPE_GENEVE in cfg.CONF.ml2.type_drivers and
+ cfg.CONF.ml2_type_geneve.max_header_size <
OVN_MIN_GENEVE_MAX_HEADER_SIZE):
LOG.critical('Geneve max_header_size set too low for OVN '
'(%d vs %d)',