commit 0af962d60af2afc1d0c45f903ceaa0c6154e9843
author Zuul <zuul@review.opendev.org> Mon Aug 01 23:36:22 2022 +0000
committer Gerrit Code Review <review@openstack.org> Mon Aug 01 23:36:22 2022 +0000
tree 8c18d7596294fbb0eabe53b99d53d9b0cece0f1e
parent bd6e5205b115fb0cafed7f50a676699a4b9fc0fe
parent cf0bf746e996b780714a085b0e6f38899c2c832e

Merge "Neutron: Set experimental option to use linuxbridge agent"

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 2d77df6..370c994 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -229,6 +229,10 @@
         else
             mech_drivers+=",linuxbridge"
         fi
+        if [[ "$mech_drivers" == *"linuxbridge"* ]]; then
+            iniset $NEUTRON_CONF experimental linuxbridge True
+        fi
+
         iniset $NEUTRON_CORE_PLUGIN_CONF ml2 mechanism_drivers $mech_drivers
         iniset $NEUTRON_CORE_PLUGIN_CONF ml2 overlay_ip_version $TUNNEL_IP_VERSION
 

lib/neutron_plugins/ml2

diff --git a/lib/neutron_plugins/ml2 b/lib/neutron_plugins/ml2
index 7343606..fa61f1e 100644
--- a/lib/neutron_plugins/ml2
+++ b/lib/neutron_plugins/ml2
@@ -125,6 +125,9 @@
     fi
 
     populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 mechanism_drivers=$Q_ML2_PLUGIN_MECHANISM_DRIVERS
+    if [[ "$Q_ML2_PLUGIN_MECHANISM_DRIVERS" == *"linuxbridge"* ]]; then
+        iniset $NEUTRON_CONF experimental linuxbridge True
+    fi
     populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 overlay_ip_version=$TUNNEL_IP_VERSION
 
     if [[ -n "$Q_ML2_PLUGIN_TYPE_DRIVERS" ]]; then