commit 3cf9244f956953e0e64a163a96cc897c02bec14d
author Jenkins <jenkins@review.openstack.org> Sun Feb 14 14:45:40 2016 +0000
committer Gerrit Code Review <review@openstack.org> Sun Feb 14 14:45:40 2016 +0000
tree 0e6c0bc35db8c6955251658c5562cbe6b6a042fe
parent 2da17a0b657e635dc5648e9db1aa36bc96b826a1
parent 629e56540f3dec14465bc88ef51c6974bac67f12

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

lib/nova

diff --git a/lib/nova b/lib/nova
index cf06955..cce538d 100644
--- a/lib/nova
+++ b/lib/nova
@@ -686,8 +686,6 @@
     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