openstack/devstack
Code Issues Proposed changes

Correctly set the L3 service plugin for ML2

Browse Source 
ML2 uses a service plugin for L3. This patch to devstack
correctly sets this by setting or updating the variable
Q_SERVICE_PLUGIN_CLASSES, which makes ML2 compatible when
running with other service plugins (e.g. LBaaS and VPN).

Fixes bug 1231622

Change-Id: I0ce1f5a42bd052995135ffac1ee5ef382d69789e
This commit is contained in:
Kyle Mestery 2013-09-22 03:04:56 +00:00
parent 496273101e
commit 14ea1a2b79
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/neutron_plugins/ml2
View File

@ -30,6 +30,9 @@ Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS=${Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS:-vni_ranges=10
# Default VLAN TypeDriver options # Default VLAN TypeDriver options
Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS=${Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS:-} Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS=${Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS:-}
# L3 Plugin to load for ML2
ML2_L3_PLUGIN=${ML2_L3_PLUGIN:-neutron.services.l3_router.l3_router_plugin.L3RouterPlugin}
function populate_ml2_config() { function populate_ml2_config() {
OPTS=$1 OPTS=$1
CONF=$2 CONF=$2
@ -48,13 +51,11 @@ function neutron_plugin_configure_common() {
Q_PLUGIN_CLASS="neutron.plugins.ml2.plugin.Ml2Plugin" Q_PLUGIN_CLASS="neutron.plugins.ml2.plugin.Ml2Plugin"
# The ML2 plugin delegates L3 routing/NAT functionality to # The ML2 plugin delegates L3 routing/NAT functionality to
# the L3 service plugin which must therefore be specified. # the L3 service plugin which must therefore be specified.
Q_L3_PLUGIN_CLASS=${Q_L3_PLUGIN_CLASS:-"neutron.services.l3_router.l3_router_plugin.L3RouterPlugin"} if [[ $Q_SERVICE_PLUGIN_CLASSES == '' ]]; then
if ini_has_option $NEUTRON_CONF DEFAULT service_plugins ; then Q_SERVICE_PLUGIN_CLASSES=$ML2_L3_PLUGIN
srv_plugins=$(iniget $NEUTRON_CONF DEFAULT service_plugins)","$Q_L3_PLUGIN_CLASS
else else
srv_plugins=$Q_L3_PLUGIN_CLASS Q_SERVICE_PLUGIN_CLASSES="$Q_SERVICE_PLUGIN_CLASSES,$ML2_L3_PLUGIN"
fi fi
iniset $NEUTRON_CONF DEFAULT service_plugins $srv_plugins
} }
function neutron_plugin_configure_service() { function neutron_plugin_configure_service() {