From: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date: Tue, 12 Feb 2013 08:01:09 +0000 (+0900)
Subject: Remove duplicated option state_path from netns cleanup
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=aae63b33f1152cf5e8e9e75ca053a0746135b773;p=openstack-build%2Fneutron-build.git

Remove duplicated option state_path from netns cleanup

state_path is already declared in quantum/common/config.py,
so we need to remove state_path option from netns_cleanup_util.

Fixes bug 1122822

Change-Id: Ifc1c0290c00c1fe5e2fc1833144da05615a782ef
---

diff --git a/quantum/agent/netns_cleanup_util.py b/quantum/agent/netns_cleanup_util.py
index 9c6660d52..b3442c8db 100644
--- a/quantum/agent/netns_cleanup_util.py
+++ b/quantum/agent/netns_cleanup_util.py
@@ -60,9 +60,6 @@ def setup_conf():
         cfg.StrOpt('dhcp_driver',
                    default='quantum.agent.linux.dhcp.Dnsmasq',
                    help=_("The driver used to manage the DHCP server.")),
-        cfg.StrOpt('state_path',
-                   default='.',
-                   help=_('Top-level directory for maintaining dhcp state')),
         cfg.BoolOpt('force',
                     default=False,
                     help=_('Delete the namespace by removing all devices.')),