...
|
...
|
@@ -85,7 +85,8 @@ fi
|
85
|
85
|
PUBLIC_INTERFACE=${PUBLIC_INTERFACE:-eth0}
|
86
|
86
|
VLAN_INTERFACE=${VLAN_INTERFACE:-$PUBLIC_INTERFACE}
|
87
|
87
|
FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.1/28}
|
88
|
|
-FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/16}
|
|
88
|
+FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24}
|
|
89
|
+FIXED_NETWORK_SIZE=${FIXED_NETWORK_SIZE:-256}
|
89
|
90
|
NET_MAN=${NET_MAN:-FlatDHCPManager}
|
90
|
91
|
EC2_DMZ_HOST=${EC2_DMZ_HOST:-$HOST_IP}
|
91
|
92
|
FLAT_NETWORK_BRIDGE=${FLAT_NETWORK_BRIDGE:-br100}
|
...
|
...
|
@@ -378,7 +379,7 @@ if [[ "$ENABLED_SERVICES" =~ "mysql" ]]; then
|
378
|
378
|
$NOVA_DIR/bin/nova-manage db sync
|
379
|
379
|
|
380
|
380
|
# create a small network
|
381
|
|
- $NOVA_DIR/bin/nova-manage network create private $FIXED_RANGE 1 32
|
|
381
|
+ $NOVA_DIR/bin/nova-manage network create private $FIXED_RANGE 1 $FIXED_NETWORK_SIZE
|
382
|
382
|
|
383
|
383
|
# create some floating ips
|
384
|
384
|
$NOVA_DIR/bin/nova-manage floating create $FLOATING_RANGE
|