a52041cd3f
Module lib/neutron was introduced long time ago as new module to deploy neutron. It was intended to replace old lib/neutron-legacy module. But since very long time it wasn't really finished and used by anyone and lib/neutron-legacy is defacto standard module used by everyone to deploy neutron with devstack. In [1] unfinished lib/neutron was deprecated and now it's time to remove it from the devstack code. This patch also renames old "lib/neutron-legacy" module to be "lib/neutron" now. Previously "old" lib/neutron-legacy module was accepting neutron services names wit "q-" prefix and "new" lib/neutron module was accepting services with "neutron-" prefix. Now, as there is only one module it accepts both prefixes. For historical reasons and to be consistent with old lib/neutron-legacy which was widely used everywhere, services will be named with "q-" prefix but both prefixes will be accepted to enable or disable services. This patch also moves _configure_neutron_service function to be called at the end of the "configure_neutron" after all agents and service plugins are already configured. [1] https://review.opendev.org/c/openstack/devstack/+/823653 Related-bug: #1996748 Change-Id: Ibf1c8b2ee6b6618f77cd8486e9c687993d7cb4a0
158 lines
6.1 KiB
Bash
158 lines
6.1 KiB
Bash
#!/bin/bash
|
|
#
|
|
# Neutron Modular Layer 2 plugin
|
|
# ------------------------------
|
|
|
|
# Save trace setting
|
|
_XTRACE_NEUTRON_ML2=$(set +o | grep xtrace)
|
|
set +o xtrace
|
|
|
|
# Default OVN L2 agent
|
|
Q_AGENT=${Q_AGENT:-ovn}
|
|
if [ -f $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent ]; then
|
|
source $TOP_DIR/lib/neutron_plugins/${Q_AGENT}_agent
|
|
fi
|
|
|
|
# Enable this to simply and quickly enable tunneling with ML2.
|
|
# For ML2/OVS select either 'gre', 'vxlan', or 'gre,vxlan'.
|
|
# For ML2/OVN use 'geneve'.
|
|
Q_ML2_TENANT_NETWORK_TYPE=${Q_ML2_TENANT_NETWORK_TYPE:-"geneve"}
|
|
# This has to be set here since the agent will set this in the config file
|
|
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" == "gre" || "$Q_ML2_TENANT_NETWORK_TYPE" == "vxlan" ]]; then
|
|
Q_TUNNEL_TYPES=$Q_ML2_TENANT_NETWORK_TYPE
|
|
elif [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
|
|
Q_TUNNEL_TYPES=gre
|
|
fi
|
|
|
|
# List of MechanismDrivers to load
|
|
Q_ML2_PLUGIN_MECHANISM_DRIVERS=${Q_ML2_PLUGIN_MECHANISM_DRIVERS:-ovn}
|
|
# 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=$TENANT_TUNNEL_RANGES}
|
|
# Default VLAN TypeDriver options
|
|
Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS=${Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS:-}
|
|
# Default GENEVE TypeDriver options
|
|
Q_ML2_PLUGIN_GENEVE_TYPE_OPTIONS=${Q_ML2_PLUGIN_GENEVE_TYPE_OPTIONS:-vni_ranges=$TENANT_TUNNEL_RANGES}
|
|
# List of extension drivers to load, use '-' instead of ':-' to allow people to
|
|
# explicitly override this to blank
|
|
if [[ "$NEUTRON_PORT_SECURITY" = "True" ]]; then
|
|
Q_ML2_PLUGIN_EXT_DRIVERS=${Q_ML2_PLUGIN_EXT_DRIVERS-port_security}
|
|
else
|
|
Q_ML2_PLUGIN_EXT_DRIVERS=${Q_ML2_PLUGIN_EXT_DRIVERS:-}
|
|
fi
|
|
|
|
# L3 Plugin to load for ML2
|
|
# For some flat network environment, they not want to extend L3 plugin.
|
|
# Make sure it is able to set empty to ML2_L3_PLUGIN.
|
|
ML2_L3_PLUGIN=${ML2_L3_PLUGIN-router}
|
|
|
|
function populate_ml2_config {
|
|
CONF=$1
|
|
SECTION=$2
|
|
OPTS=$3
|
|
|
|
if [ -z "$OPTS" ]; then
|
|
return
|
|
fi
|
|
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_PLUGIN_CLASS="ml2"
|
|
# The ML2 plugin delegates L3 routing/NAT functionality to
|
|
# the L3 service plugin which must therefore be specified.
|
|
neutron_service_plugin_class_add $ML2_L3_PLUGIN
|
|
}
|
|
|
|
function neutron_plugin_configure_service {
|
|
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "local" ]]; 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
|
|
|
|
|
|
# Allow for setup the flat type network
|
|
if [[ -z "$Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS" ]]; then
|
|
if [[ -n "$PHYSICAL_NETWORK" || -n "$PUBLIC_PHYSICAL_NETWORK" ]]; then
|
|
Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS="flat_networks="
|
|
if [[ -n "$PHYSICAL_NETWORK" ]]; then
|
|
Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS+="${PHYSICAL_NETWORK},"
|
|
fi
|
|
if [[ -n "$PUBLIC_PHYSICAL_NETWORK" ]] && [[ "${PHYSICAL_NETWORK}" != "$PUBLIC_PHYSICAL_NETWORK" ]]; then
|
|
Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS+="${PUBLIC_PHYSICAL_NETWORK},"
|
|
fi
|
|
fi
|
|
fi
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE securitygroup enable_security_group=$Q_USE_SECGROUP
|
|
|
|
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
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 type_drivers=$Q_ML2_PLUGIN_TYPE_DRIVERS
|
|
fi
|
|
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 extension_drivers=$Q_ML2_PLUGIN_EXT_DRIVERS
|
|
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2 $Q_SRV_EXTRA_OPTS
|
|
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_type_gre $Q_ML2_PLUGIN_GRE_TYPE_OPTIONS
|
|
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_type_vxlan $Q_ML2_PLUGIN_VXLAN_TYPE_OPTIONS
|
|
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_type_flat $Q_ML2_PLUGIN_FLAT_TYPE_OPTIONS
|
|
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_type_vlan $Q_ML2_PLUGIN_VLAN_TYPE_OPTIONS
|
|
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE ml2_type_geneve $Q_ML2_PLUGIN_GENEVE_TYPE_OPTIONS
|
|
|
|
if [[ "$Q_DVR_MODE" != "legacy" ]]; then
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE agent l2_population=True
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE agent tunnel_types=vxlan
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE agent enable_distributed_routing=True
|
|
populate_ml2_config /$Q_PLUGIN_CONF_FILE agent arp_responder=True
|
|
fi
|
|
}
|
|
|
|
function has_neutron_plugin_security_group {
|
|
return 0
|
|
}
|
|
|
|
function configure_qos_ml2 {
|
|
neutron_ml2_extension_driver_add "qos"
|
|
}
|
|
|
|
# Restore xtrace
|
|
$_XTRACE_NEUTRON_ML2
|