Merge "vxlan default ml2 tenant network type"
This commit is contained in:
commit
a0c6d1e954
@ -166,10 +166,10 @@ fi
|
|||||||
# remote connectivity), and no physical resources will be
|
# remote connectivity), and no physical resources will be
|
||||||
# available for the allocation of provider networks.
|
# available for the allocation of provider networks.
|
||||||
|
|
||||||
# To use GRE tunnels for tenant networks, set to True in
|
# To disable tunnels (GRE or VXLAN) for tenant networks,
|
||||||
# ``localrc``. GRE tunnels are only supported by the openvswitch
|
# set to False in ``local.conf``.
|
||||||
# plugin, and currently only on Ubuntu.
|
# GRE tunnels are only supported by the openvswitch.
|
||||||
ENABLE_TENANT_TUNNELS=${ENABLE_TENANT_TUNNELS:-False}
|
ENABLE_TENANT_TUNNELS=${ENABLE_TENANT_TUNNELS:-True}
|
||||||
|
|
||||||
# If using GRE tunnels for tenant networks, specify the range of
|
# If using GRE tunnels for tenant networks, specify the range of
|
||||||
# tunnel IDs from which tenant networks are allocated. Can be
|
# tunnel IDs from which tenant networks are allocated. Can be
|
||||||
|
@ -7,9 +7,9 @@ set +o xtrace
|
|||||||
|
|
||||||
# Enable this to simply and quickly enable tunneling with ML2.
|
# Enable this to simply and quickly enable tunneling with ML2.
|
||||||
# Select either 'gre', 'vxlan', or '(gre vxlan)'
|
# Select either 'gre', 'vxlan', or '(gre vxlan)'
|
||||||
Q_ML2_TENANT_NETWORK_TYPE=${Q_ML2_TENANT_NETWORK_TYPE:-}
|
Q_ML2_TENANT_NETWORK_TYPE=${Q_ML2_TENANT_NETWORK_TYPE:-"vxlan"}
|
||||||
# This has to be set here since the agent will set this in the config file
|
# This has to be set here since the agent will set this in the config file
|
||||||
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "" ]]; then
|
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "local" ]]; then
|
||||||
Q_AGENT_EXTRA_AGENT_OPTS+=(tunnel_types=$Q_ML2_TENANT_NETWORK_TYPE)
|
Q_AGENT_EXTRA_AGENT_OPTS+=(tunnel_types=$Q_ML2_TENANT_NETWORK_TYPE)
|
||||||
elif [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
|
elif [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
|
||||||
Q_AGENT_EXTRA_AGENT_OPTS+=(tunnel_types=gre)
|
Q_AGENT_EXTRA_AGENT_OPTS+=(tunnel_types=gre)
|
||||||
@ -57,7 +57,7 @@ function neutron_plugin_configure_common {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function neutron_plugin_configure_service {
|
function neutron_plugin_configure_service {
|
||||||
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "" ]]; then
|
if [[ "$Q_ML2_TENANT_NETWORK_TYPE" != "local" ]]; then
|
||||||
Q_SRV_EXTRA_OPTS+=(tenant_network_types=$Q_ML2_TENANT_NETWORK_TYPE)
|
Q_SRV_EXTRA_OPTS+=(tenant_network_types=$Q_ML2_TENANT_NETWORK_TYPE)
|
||||||
elif [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
|
elif [[ "$ENABLE_TENANT_TUNNELS" == "True" ]]; then
|
||||||
# This assumes you want a simple configuration, and will overwrite
|
# This assumes you want a simple configuration, and will overwrite
|
||||||
|
Loading…
Reference in New Issue
Block a user