Browse code

Revert "reduce default lease time to 5 minutes"

We have a fix in Nova which should make this unessessary,
revert to see if that's true.

This reverts commit 61aa0e9f1968c9991dee7bb5aec9a2a63ac0339d.

Change-Id: If109af452ad583417e3a3a3ef1c9b545f1ec9b89

Sean Dague authored on 2016/02/11 20:31:56
Showing 1 changed files
... ...
@@ -689,8 +689,6 @@ function create_nova_conf_nova_network {
689 689
     iniset $NOVA_CONF DEFAULT public_interface "$PUBLIC_INTERFACE"
690 690
     iniset $NOVA_CONF DEFAULT vlan_interface "$VLAN_INTERFACE"
691 691
     iniset $NOVA_CONF DEFAULT flat_network_bridge "$FLAT_NETWORK_BRIDGE"
692
-    # force down dhcp leases to 5 minutes, which lets us expire faster
693
-    iniset $NOVA_CONF DEFAULT dhcp_lease_time 300
694 692
     if [ -n "$FLAT_INTERFACE" ]; then
695 693
         iniset $NOVA_CONF DEFAULT flat_interface "$FLAT_INTERFACE"
696 694
     fi