openstack/devstack
Code Issues Proposed changes

Default to /24 prefix for floating IP range with neutron

Browse Source 
When running Tempest parallel tests with neutron, several long-running
tests might create routers and floating IPs, which will result in
IP allocations over the public network.

Increasing the public network size should ensure tests do not fail
due to IP address shortage; this patch also updates the public network
gateway IP address.

Related-Bug: 1253966

Change-Id: Ie075b3c4d14a07b06c42fd29b09770dd1972aa45
This commit is contained in:
Salvatore Orlando 2013-11-25 05:44:10 -08:00
parent ad2966d727
commit 90234ac4b0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/neutron
View File

@ -68,7 +68,7 @@ set +o xtrace
# Gateway and subnet defaults, in case they are not customized in localrc # Gateway and subnet defaults, in case they are not customized in localrc
NETWORK_GATEWAY=${NETWORK_GATEWAY:-10.0.0.1} NETWORK_GATEWAY=${NETWORK_GATEWAY:-10.0.0.1}
PUBLIC_NETWORK_GATEWAY=${PUBLIC_NETWORK_GATEWAY:-172.24.4.225} PUBLIC_NETWORK_GATEWAY=${PUBLIC_NETWORK_GATEWAY:-172.24.4.1}
PRIVATE_SUBNET_NAME=${PRIVATE_SUBNET_NAME:-"private-subnet"} PRIVATE_SUBNET_NAME=${PRIVATE_SUBNET_NAME:-"private-subnet"}
PUBLIC_SUBNET_NAME=${PUBLIC_SUBNET_NAME:-"public-subnet"} PUBLIC_SUBNET_NAME=${PUBLIC_SUBNET_NAME:-"public-subnet"}

2
lib/neutron_thirdparty/nicira vendored
View File

@ -20,7 +20,7 @@ set +o xtrace
NVP_GATEWAY_NETWORK_INTERFACE=${NVP_GATEWAY_NETWORK_INTERFACE:-eth2} NVP_GATEWAY_NETWORK_INTERFACE=${NVP_GATEWAY_NETWORK_INTERFACE:-eth2}
# Re-declare floating range as it's needed also in stop_nicira, which # Re-declare floating range as it's needed also in stop_nicira, which
# is invoked by unstack.sh # is invoked by unstack.sh
FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.224/28} FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.0/24}
function configure_nicira() { function configure_nicira() {
: :

2
stack.sh
View File

@ -260,7 +260,7 @@ safe_chown -R $STACK_USER $DATA_DIR
# from either range when attempting to guess the IP to use for the host. # from either range when attempting to guess the IP to use for the host.
# Note that setting FIXED_RANGE may be necessary when running DevStack # Note that setting FIXED_RANGE may be necessary when running DevStack
# in an OpenStack cloud that uses either of these address ranges internally. # in an OpenStack cloud that uses either of these address ranges internally.
FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.224/28} FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.0/24}
FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24} FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24}
FIXED_NETWORK_SIZE=${FIXED_NETWORK_SIZE:-256} FIXED_NETWORK_SIZE=${FIXED_NETWORK_SIZE:-256}