diff --git a/lib/neutron b/lib/neutron index b05b16d72e..00bcd3c1e1 100644 --- a/lib/neutron +++ b/lib/neutron @@ -69,7 +69,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 3efb5a93b3..a24392cd4d 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 22d184efd9..ce5fbd47e5 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}