openstack/devstack
Code Issues Proposed changes

Merge "Neutron L3 subnetpool creation should be optional"

Browse Source
This commit is contained in:
Jenkins 2016-10-11 19:45:27 +00:00 committed by Gerrit Code Review
commit fab7a04de8
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/guides/neutron.rst
View File

@ -392,6 +392,7 @@ controller node.
PROVIDER_SUBNET_NAME="provider_net" PROVIDER_SUBNET_NAME="provider_net"
PROVIDER_NETWORK_TYPE="vlan" PROVIDER_NETWORK_TYPE="vlan"
SEGMENTATION_ID=2010 SEGMENTATION_ID=2010
USE_SUBNETPOOL=False
In this configuration we are defining FIXED_RANGE to be a In this configuration we are defining FIXED_RANGE to be a
publicly routed IPv4 subnet. In this specific instance we are using publicly routed IPv4 subnet. In this specific instance we are using
@ -577,6 +578,7 @@ you do not require them.
PROVIDER_SUBNET_NAME="provider_net" PROVIDER_SUBNET_NAME="provider_net"
PROVIDER_NETWORK_TYPE="vlan" PROVIDER_NETWORK_TYPE="vlan"
SEGMENTATION_ID=2010 SEGMENTATION_ID=2010
USE_SUBNETPOOL=False
[[post-config|/$Q_PLUGIN_CONF_FILE]] [[post-config|/$Q_PLUGIN_CONF_FILE]]
[macvtap] [macvtap]

3
lib/neutron_plugins/services/l3
View File

@ -83,6 +83,7 @@ PRIVATE_SUBNET_NAME=${PRIVATE_SUBNET_NAME:-"private-subnet"}
PUBLIC_SUBNET_NAME=${PUBLIC_SUBNET_NAME:-"public-subnet"} PUBLIC_SUBNET_NAME=${PUBLIC_SUBNET_NAME:-"public-subnet"}
# Subnetpool defaults # Subnetpool defaults
USE_SUBNETPOOL=${USE_SUBNETPOOL:-True}
SUBNETPOOL_NAME=${SUBNETPOOL_NAME:-"shared-default-subnetpool"} SUBNETPOOL_NAME=${SUBNETPOOL_NAME:-"shared-default-subnetpool"}
SUBNETPOOL_PREFIX_V4=${SUBNETPOOL_PREFIX_V4:-10.0.0.0/8} SUBNETPOOL_PREFIX_V4=${SUBNETPOOL_PREFIX_V4:-10.0.0.0/8}
@ -171,6 +172,7 @@ function create_neutron_initial_network {
fi fi
if is_networking_extension_supported "auto-allocated-topology"; then if is_networking_extension_supported "auto-allocated-topology"; then
if [[ "$USE_SUBNETPOOL" == "True" ]]; then
if [[ "$IP_VERSION" =~ 4.* ]]; then if [[ "$IP_VERSION" =~ 4.* ]]; then
SUBNETPOOL_V4_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" subnetpool-create $SUBNETPOOL_NAME --default-prefixlen $SUBNETPOOL_SIZE_V4 --pool-prefix $SUBNETPOOL_PREFIX_V4 --shared --is-default=True | grep ' id ' | get_field 2) SUBNETPOOL_V4_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" subnetpool-create $SUBNETPOOL_NAME --default-prefixlen $SUBNETPOOL_SIZE_V4 --pool-prefix $SUBNETPOOL_PREFIX_V4 --shared --is-default=True | grep ' id ' | get_field 2)
fi fi
@ -178,6 +180,7 @@ function create_neutron_initial_network {
SUBNETPOOL_V6_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" subnetpool-create $SUBNETPOOL_NAME --default-prefixlen $SUBNETPOOL_SIZE_V6 --pool-prefix $SUBNETPOOL_PREFIX_V6 --shared --is-default=True | grep ' id ' | get_field 2) SUBNETPOOL_V6_ID=$(neutron --os-cloud devstack-admin --os-region "$REGION_NAME" subnetpool-create $SUBNETPOOL_NAME --default-prefixlen $SUBNETPOOL_SIZE_V6 --pool-prefix $SUBNETPOOL_PREFIX_V6 --shared --is-default=True | grep ' id ' | get_field 2)
fi fi
fi fi
fi
if is_provider_network; then if is_provider_network; then
die_if_not_set $LINENO PHYSICAL_NETWORK "You must specify the PHYSICAL_NETWORK" die_if_not_set $LINENO PHYSICAL_NETWORK "You must specify the PHYSICAL_NETWORK"