From 90234ac4b03426d844b72d251d4cae13fa09cde5 Mon Sep 17 00:00:00 2001 From: Salvatore Orlando Date: Mon, 25 Nov 2013 05:44:10 -0800 Subject: [PATCH] Default to /24 prefix for floating IP range with neutron 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 --- lib/neutron | 2 +- lib/neutron_thirdparty/nicira | 2 +- stack.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/neutron b/lib/neutron index 70417be5d3..786e8f8712 100644 --- a/lib/neutron +++ b/lib/neutron @@ -68,7 +68,7 @@ set +o xtrace # Gateway and subnet defaults, in case they are not customized in localrc 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"} PUBLIC_SUBNET_NAME=${PUBLIC_SUBNET_NAME:-"public-subnet"} diff --git a/lib/neutron_thirdparty/nicira b/lib/neutron_thirdparty/nicira index 3f2a5af11f..5b034e0c62 100644 --- a/lib/neutron_thirdparty/nicira +++ b/lib/neutron_thirdparty/nicira @@ -20,7 +20,7 @@ set +o xtrace NVP_GATEWAY_NETWORK_INTERFACE=${NVP_GATEWAY_NETWORK_INTERFACE:-eth2} # Re-declare floating range as it's needed also in stop_nicira, which # 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() { : diff --git a/stack.sh b/stack.sh index 47d93bd642..d0674066b5 100755 --- a/stack.sh +++ b/stack.sh @@ -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. # Note that setting FIXED_RANGE may be necessary when running DevStack # 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_NETWORK_SIZE=${FIXED_NETWORK_SIZE:-256}