b772659f9d
This commit adds support to devstack to set ML2 options including
MechanismDrivers, TypeDrivers, and TypeDriver specific configuration for ML2
when running with devstack.
This also allows for simple configuration of VLAN, GRE, and VXLAN ML2 devstack
setups with the OVS agent as follows:
# VLAN configuration
Q_PLUGIN=ml2
ENABLE_TENANT_VLANS=True
# GRE tunnel configuration
Q_PLUGIN=ml2
ENABLE_TENANT_TUNNELS=True
# VXLAN tunnel configuration
Q_PLUGIN=ml2
Q_ML2_TENANT_NETWORK_TYPE=vxlan
Fixes bug 1200767
Change-Id: Ib16efac13440b5d50658a0e6be35bc735510a262
114 lines
4.5 KiB
Plaintext
114 lines
4.5 KiB
Plaintext
# Neutron Modular Layer 2 plugin
|
|
# ------------------------------
|
|
|
|
# Save trace setting
|
|
MY_XTRACE=$(set +o | grep xtrace)
|
|
set +o xtrace
|
|
|
|
# Enable this to simply and quickly enable tunneling with ML2.
|
|
# Select either 'gre', 'vxlan', or '(gre vxlan)'
|
|
Q_ML2_TENANT_NETWORK_TYPE=${Q_ML2_TENANT_NETWORK_TYPE:-}
|
|
# This has to be set here since the agent will set this in the config file
|
|
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "" ]]; then
|
|
Q_AGENT_EXTRA_AGENT_OPTS=(tunnel_types=$Q_ML2_TENANT_NETWORK_TYPE)
|
|
elif [[ "$ENABLE_TENANT_TUNNELS" = "True" ]]; then
|
|
Q_AGENT_EXTRA_AGENT_OPTS=(tunnel_types=gre)
|
|
fi
|
|
|
|
# Default openvswitch L2 agent
|
|
Q_AGENT=${Q_AGENT:-openvswitch}
|
|
source $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent
|
|
|
|
# List of MechanismDrivers to load
|
|
Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_PLUGIN_MECHANISM_DRIVERS:-}
|
|
# List of Type Drivers to load
|
|
Q_ML2_PLUGIN_TYPE_DRIVERS=${Q_ML2_PLUGIN_TYPE_DRIVERS:-local,flat,vlan,gre,vxlan}
|
|
# Default GRE TypeDriver options
|
|
Q_ML2_PLUGIN_GRE_TYPE_OPTIONS=${Q_ML2_PLUGIN_GRE_TYPE_OPTIONS:-tunnel_id_ranges=$TENANT_TUNNEL_RANGES}
|
|
# Default VXLAN TypeDriver options
|
|
Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS=${Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS:-vni_ranges=1001:2000}
|
|
# Default VLAN TypeDriver options
|
|
Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS=${Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS:-}
|
|
|
|
function populate_ml2_config() {
|
|
OPTS=$1
|
|
CONF=$2
|
|
SECTION=$3
|
|
|
|
for I in "${OPTS[@]}"; do
|
|
# Replace the first '=' with ' ' for iniset syntax
|
|
iniset $CONF $SECTION ${I/=/ }
|
|
done
|
|
}
|
|
|
|
function neutron_plugin_configure_common() {
|
|
Q_PLUGIN_CONF_PATH=etc/neutron/plugins/ml2
|
|
Q_PLUGIN_CONF_FILENAME=ml2_conf.ini
|
|
Q_DB_NAME="neutron_ml2"
|
|
Q_PLUGIN_CLASS="neutron.plugins.ml2.plugin.Ml2Plugin"
|
|
}
|
|
|
|
function neutron_plugin_configure_service() {
|
|
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "" ]]; then
|
|
Q_SRV_EXTRA_OPTS=(tenant_network_types=$Q_ML2_TENANT_NETWORK_TYPE)
|
|
elif [[ "$ENABLE_TENANT_TUNNELS" = "True" ]]; then
|
|
# This assumes you want a simple configuration, and will overwrite
|
|
# Q_SRV_EXTRA_OPTS if set in addition to ENABLE_TENANT_TUNNELS.
|
|
Q_SRV_EXTRA_OPTS=(tenant_network_types=gre)
|
|
Q_ML2_PLUGIN_GRE_TYPE_OPTIONS=(tunnel_id_ranges=$TENANT_TUNNEL_RANGES)
|
|
elif [[ "$ENABLE_TENANT_VLANS" = "True" ]]; then
|
|
Q_SRV_EXTRA_OPTS=(tenant_network_types=vlan)
|
|
else
|
|
echo "WARNING - The ml2 plugin is using local tenant networks, with no connectivity between hosts."
|
|
fi
|
|
|
|
# Allow for overrding VLAN configuration (for example, to configure provider
|
|
# VLANs) by first checking if Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS is set.
|
|
if [ "$Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS" == "" ]; then
|
|
if [[ "$ML2_VLAN_RANGES" = "" ]] && [[ "$PHYSICAL_NETWORK" != "" ]]; then
|
|
ML2_VLAN_RANGES=$PHYSICAL_NETWORK
|
|
if [[ "$TENANT_VLAN_RANGE" != "" ]]; then
|
|
ML2_VLAN_RANGES=$ML2_VLAN_RANGES:$TENANT_VLAN_RANGE
|
|
fi
|
|
fi
|
|
if [[ "$ML2_VLAN_RANGES" != "" ]]; then
|
|
Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS=(network_vlan_ranges=$ML2_VLAN_RANGES)
|
|
fi
|
|
fi
|
|
|
|
# REVISIT(rkukura): Setting firewall_driver here for
|
|
# neutron.agent.securitygroups_rpc.is_firewall_enabled() which is
|
|
# used in the server, in case no L2 agent is configured on the
|
|
# server's node. If an L2 agent is configured, this will get
|
|
# overridden with the correct driver. The ml2 plugin should
|
|
# instead use its own config variable to indicate whether security
|
|
# groups is enabled, and that will need to be set here instead.
|
|
if [[ "$Q_USE_SECGROUP" == "True" ]]; then
|
|
iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver neutron.agent.not.a.real.FirewallDriver
|
|
else
|
|
iniset /$Q_PLUGIN_CONF_FILE SECURITYGROUP firewall_driver neutron.agent.firewall.NoopFirewallDriver
|
|
fi
|
|
|
|
# Since we enable the tunnel TypeDrivers, also enable a local_ip
|
|
iniset /$Q_PLUGIN_CONF_FILE ovs local_ip $HOST_IP
|
|
|
|
populate_ml2_config type_drivers=$Q_ML2_PLUGIN_TYPE_DRIVERS /$Q_PLUGIN_CONF_FILE ml2
|
|
|
|
populate_ml2_config $Q_SRV_EXTRA_OPTS /$Q_PLUGIN_CONF_FILE ml2
|
|
|
|
populate_ml2_config $Q_ML2_PLUGIN_GRE_TYPE_OPTIONS /$Q_PLUGIN_CONF_FILE ml2_type_gre
|
|
|
|
populate_ml2_config $Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS /$Q_PLUGIN_CONF_FILE ml2_type_vxlan
|
|
|
|
if [ "$Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS" != "" ]; then
|
|
populate_ml2_config $Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS /$Q_PLUGIN_CONF_FILE ml2_type_vlan
|
|
fi
|
|
}
|
|
|
|
function has_neutron_plugin_security_group() {
|
|
return 0
|
|
}
|
|
|
|
# Restore xtrace
|
|
$MY_XTRACE
|