openstack/devstack
Code Issues Proposed changes

Merge "Enable vlan networking for newer neutron plugin"

Browse Source
This commit is contained in:
Zuul 2019-07-26 08:20:31 +00:00 committed by Gerrit Code Review
commit c17ad84a00
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/neutron
View File

@ -98,6 +98,17 @@ NEUTRON_ROOTWRAP_DAEMON_CMD="$NEUTRON_ROOTWRAP-daemon $NEUTRON_ROOTWRAP_CONF_FIL
PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex} PUBLIC_BRIDGE=${PUBLIC_BRIDGE:-br-ex}
PUBLIC_BRIDGE_MTU=${PUBLIC_BRIDGE_MTU:-1500} PUBLIC_BRIDGE_MTU=${PUBLIC_BRIDGE_MTU:-1500}
# Network type - default vxlan, however enables vlan based jobs to override
# using the legacy environment variable as well as a new variable in greater
# alignment with the naming scheme of this plugin.
NEUTRON_TENANT_NETWORK_TYPE=${NEUTRON_TENANT_NETWORK_TYPE:-vxlan}
NEUTRON_TENANT_VLAN_RANGE=${NEUTRON_TENANT_VLAN_RANGE:-${TENANT_VLAN_RANGE:-100:150}}
# Physical network for VLAN network usage.
NEUTRON_PHYSICAL_NETWORK=${NEUTRON_PHYSICAL_NETWORK:-}
# Additional neutron api config files # Additional neutron api config files
declare -a -g _NEUTRON_SERVER_EXTRA_CONF_FILES_ABS declare -a -g _NEUTRON_SERVER_EXTRA_CONF_FILES_ABS
@ -201,9 +212,8 @@ function configure_neutron_new {
configure_keystone_authtoken_middleware $NEUTRON_CONF neutron configure_keystone_authtoken_middleware $NEUTRON_CONF neutron
configure_keystone_authtoken_middleware $NEUTRON_CONF nova nova configure_keystone_authtoken_middleware $NEUTRON_CONF nova nova
# Configure VXLAN # Configure tenant network type
# TODO(sc68cal) not hardcode? iniset $NEUTRON_CORE_PLUGIN_CONF ml2 tenant_network_types $NEUTRON_TENANT_NETWORK_TYPE
iniset $NEUTRON_CORE_PLUGIN_CONF ml2 tenant_network_types vxlan
local mech_drivers="openvswitch" local mech_drivers="openvswitch"
if [[ "$NEUTRON_DISTRIBUTED_ROUTING" = "True" ]]; then if [[ "$NEUTRON_DISTRIBUTED_ROUTING" = "True" ]]; then
@ -215,6 +225,9 @@ function configure_neutron_new {
iniset $NEUTRON_CORE_PLUGIN_CONF ml2_type_vxlan vni_ranges 1001:2000 iniset $NEUTRON_CORE_PLUGIN_CONF ml2_type_vxlan vni_ranges 1001:2000
iniset $NEUTRON_CORE_PLUGIN_CONF ml2_type_flat flat_networks public iniset $NEUTRON_CORE_PLUGIN_CONF ml2_type_flat flat_networks public
if [[ "$NEUTRON_TENANT_NETWORK_TYPE" =~ "vlan" ]] && [[ "$NEUTRON_PHYSICAL_NETWORK" != "" ]]; then
iniset $NEUTRON_CORE_PLUGIN_CONF ml2_type_vlan network_vlan_ranges ${NEUTRON_PHYSICAL_NETWORK}:${NEUTRON_TENANT_VLAN_RANGE}
fi
if [[ "$NEUTRON_PORT_SECURITY" = "True" ]]; then if [[ "$NEUTRON_PORT_SECURITY" = "True" ]]; then
neutron_ml2_extension_driver_add port_security neutron_ml2_extension_driver_add port_security
fi fi