From cc78724a1e92887883149f5e3aee827283636733 Mon Sep 17 00:00:00 2001
From: Gary Kotton <gkotton@redhat.com>
Date: Sun, 17 Feb 2013 15:46:14 +0000
Subject: [PATCH] Shorten the DHCP default resync_interval

Fixes bug 1128180

Change-Id: Ie63ef674b5e05fab659e675774a1b25cd57d4c41
---
 etc/dhcp_agent.ini          | 2 +-
 quantum/agent/dhcp_agent.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/dhcp_agent.ini b/etc/dhcp_agent.ini
index 1d3eef0d35..0422baf847 100644
--- 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 0167e55e7e..386ca175fd 100644
--- 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',