1. devstack
  2. Commit 90234ac4b03426d844b72d251d4cae13fa09cde5
Browse code

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

Salvatore Orlando authored on 2013/11/25 22:44:10
Showing 3 changed files
lib/neutron
History View file @ 90234ac
... ... 
@@ -68,7 +68,7 @@ set +o xtrace
68 68
69 69 
 # Gateway and subnet defaults, in case they are not customized in localrc
70 70 
 NETWORK_GATEWAY=${NETWORK_GATEWAY:-10.0.0.1}
71 
-PUBLIC_NETWORK_GATEWAY=${PUBLIC_NETWORK_GATEWAY:-172.24.4.225}
71 
+PUBLIC_NETWORK_GATEWAY=${PUBLIC_NETWORK_GATEWAY:-172.24.4.1}
72 72 
 PRIVATE_SUBNET_NAME=${PRIVATE_SUBNET_NAME:-"private-subnet"}
73 73 
 PUBLIC_SUBNET_NAME=${PUBLIC_SUBNET_NAME:-"public-subnet"}
74 74
lib/neutron_thirdparty/nicira
History View file @ 90234ac
... ... 
@@ -20,7 +20,7 @@ set +o xtrace
20 20 
 NVP_GATEWAY_NETWORK_INTERFACE=${NVP_GATEWAY_NETWORK_INTERFACE:-eth2}
21 21 
 # Re-declare floating range as it's needed also in stop_nicira, which
22 22 
 # is invoked by unstack.sh
23 
-FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.224/28}
23 
+FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.0/24}
24 24
25 25 
 function configure_nicira() {
26 26 
     :
stack.sh
History View file @ 90234ac
... ... 
@@ -260,7 +260,7 @@ safe_chown -R $STACK_USER $DATA_DIR
260 260 
 # from either range when attempting to guess the IP to use for the host.
261 261 
 # Note that setting FIXED_RANGE may be necessary when running DevStack
262 262 
 # in an OpenStack cloud that uses either of these address ranges internally.
263 
-FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.224/28}
263 
+FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.0/24}
264 264 
 FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24}
265 265 
 FIXED_NETWORK_SIZE=${FIXED_NETWORK_SIZE:-256}
266 266