Shorten the DHCP default resync_interval

Fixes bug 1128180

Change-Id: Ie63ef674b5e05fab659e675774a1b25cd57d4c41

diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini
index 1d3eef0d3574bf2ab0644628a96d8aa3e928aa9e..0422baf84794d3a6e07103be86702ccaface419a 100644 (file)
--- a/etc/dhcp_agent.ini
+++ b/etc/dhcp_agent.ini
@@ -9,7 +9,7 @@
 # The DHCP agent will resync its state with Quantum to recover from any
 # transient notification or rpc errors. The interval is number of
 # seconds between attempts.
-# resync_interval = 30
+# resync_interval = 5
 
 # The DHCP requires that an inteface driver be set.  Choose the one that best
 # matches you plugin.

diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py
index 0167e55e7e1649ddd8a68268c8ab7eb02aaaba28..386ca175fd0e0c8b54a9bc217e511fc1f507036e 100644 (file)
--- a/quantum/agent/dhcp_agent.py
+++ b/quantum/agent/dhcp_agent.py
@@ -46,7 +46,7 @@ METADATA_PORT = 80
 
 class DhcpAgent(object):
     OPTS = [
-        cfg.IntOpt('resync_interval', default=30,
+        cfg.IntOpt('resync_interval', default=5,
                    help=_("Interval to resync.")),
         cfg.StrOpt('dhcp_driver',
                    default='quantum.agent.linux.dhcp.Dnsmasq',