Merge "Neutron: Set experimental option to use linuxbridge agent"
This commit is contained in:
commit
0af962d60a
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user