Browse code

Merge "Default to /24 prefix for floating IP range with neutron"

Jenkins authored on 2013/12/17 18:08:59
Showing 3 changed files
... ...
@@ -69,7 +69,7 @@ set +o xtrace
69 69
 
70 70
 # Gateway and subnet defaults, in case they are not customized in localrc
71 71
 NETWORK_GATEWAY=${NETWORK_GATEWAY:-10.0.0.1}
72
-PUBLIC_NETWORK_GATEWAY=${PUBLIC_NETWORK_GATEWAY:-172.24.4.225}
72
+PUBLIC_NETWORK_GATEWAY=${PUBLIC_NETWORK_GATEWAY:-172.24.4.1}
73 73
 PRIVATE_SUBNET_NAME=${PRIVATE_SUBNET_NAME:-"private-subnet"}
74 74
 PUBLIC_SUBNET_NAME=${PUBLIC_SUBNET_NAME:-"public-subnet"}
75 75
 
... ...
@@ -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
     :
... ...
@@ -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