...
|
...
|
@@ -84,16 +84,16 @@ fi
|
84
|
84
|
# Nova network configuration
|
85
|
85
|
PUBLIC_INTERFACE=${PUBLIC_INTERFACE:-eth0}
|
86
|
86
|
VLAN_INTERFACE=${PUBLIC_INTERFACE:-$PUBLIC_INTERFACE}
|
87
|
|
-FLOATING_RANGE=${FLOATING_RANGE:-10.6.0.0/27}
|
88
|
|
-FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/24}
|
89
|
|
-NET_MAN=${NET_MAN:-VlanManager}
|
|
87
|
+FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.1/28}
|
|
88
|
+FIXED_RANGE=${FIXED_RANGE:-10.0.0.0/16}
|
|
89
|
+NET_MAN=${NET_MAN:-FlatDHCPManager}
|
90
|
90
|
EC2_DMZ_HOST=${EC2_DMZ_HOST:-$HOST_IP}
|
91
|
91
|
FLAT_NETWORK_BRIDGE=${FLAT_NETWORK_BRIDGE:-br100}
|
92
|
92
|
|
93
|
93
|
# If you are using FlatDHCP on multiple hosts, set the ``FLAT_INTERFACE``
|
94
|
94
|
# variable but make sure that the interface doesn't already have an
|
95
|
95
|
# ip or you risk breaking things.
|
96
|
|
-# FLAT_INTERFACE=eth0
|
|
96
|
+FLAT_INTERFACE=eth0
|
97
|
97
|
|
98
|
98
|
# Nova hypervisor configuration. We default to **kvm** but will drop back to
|
99
|
99
|
# **qemu** if we are unable to load the kvm module.
|