openstack/devstack
Code Issues Proposed changes

Merge "Revert "reduce default lease time to 5 minutes""

Browse Source
This commit is contained in:
Jenkins 2016-02-14 14:45:40 +00:00 committed by Gerrit Code Review
commit 3cf9244f95
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova
View File

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