Merge "Shorten the DHCP default resync_interval" into stable/folsom

openstack · Feb 19, 2013 · 4de49b4 · 4de49b4
2 parents 004a924 + 5d26f41
commit 4de49b4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini
@@ -10,7 +10,7 @@ state_path = /opt/stack/data
 # 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
@@ -46,7 +46,7 @@
 class DhcpAgent(object):
     OPTS = [
         cfg.StrOpt('root_helper', default='sudo'),
-        cfg.IntOpt('resync_interval', default=30),
+        cfg.IntOpt('resync_interval', default=5),
         cfg.StrOpt('dhcp_driver',
                    default='quantum.agent.linux.dhcp.Dnsmasq',
                    help="The driver used to manage the DHCP server."),