From cf0bf746e996b780714a085b0e6f38899c2c832e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 13 Jul 2022 22:34:47 +0900 Subject: [PATCH] Neutron: Set experimental option to use linuxbridge agent Recently the experimental mechanism has been added to Neutron and now it requires the [experimental] linuxbridge option when the linuxbridge mechanism driver is used. Depends-on: https://review.opendev.org/c/openstack/neutron/+/845181 Change-Id: Ice82a391cda9eb0193f23e6794be7ab3df12c40b --- lib/neutron | 4 ++++ lib/neutron_plugins/ml2 | 3 +++ 2 files changed, 7 insertions(+) diff --git a/lib/neutron b/lib/neutron index 1b78493919..6e787f213a 100644 --- a/lib/neutron +++ b/lib/neutron @@ -229,6 +229,10 @@ function configure_neutron_new { 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 diff --git a/lib/neutron_plugins/ml2 b/lib/neutron_plugins/ml2 index 7343606aac..fa61f1ea30 100644 --- a/lib/neutron_plugins/ml2 +++ b/lib/neutron_plugins/ml2 @@ -125,6 +125,9 @@ function neutron_plugin_configure_service { 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