|
...
|
...
|
@@ -686,8 +686,6 @@ function create_nova_conf_nova_network {
|
|
686
|
686
|
iniset $NOVA_CONF DEFAULT public_interface "$PUBLIC_INTERFACE"
|
|
687
|
687
|
iniset $NOVA_CONF DEFAULT vlan_interface "$VLAN_INTERFACE"
|
|
688
|
688
|
iniset $NOVA_CONF DEFAULT flat_network_bridge "$FLAT_NETWORK_BRIDGE"
|
|
689
|
|
- # force down dhcp leases to 5 minutes, which lets us expire faster
|
|
690
|
|
- iniset $NOVA_CONF DEFAULT dhcp_lease_time 300
|
|
691
|
689
|
if [ -n "$FLAT_INTERFACE" ]; then
|
|
692
|
690
|
iniset $NOVA_CONF DEFAULT flat_interface "$FLAT_INTERFACE"
|
|
693
|
691
|
fi
|