From: Gary Kotton <gkotton@redhat.com>
Date: Thu, 16 May 2013 11:44:06 +0000 (+0000)
Subject: Enable quantum-netns-cleanup to receive force as cli parameter
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=7c82107f0aaee3e8624e3b3baddfe09b96b9d804;p=openstack-build%2Fneutron-build.git

Enable quantum-netns-cleanup to receive force as cli parameter

Fixes bug 1180767

Change-Id: Icd58fbe995129806426b70ea54d98f213988dbe5
---

diff --git a/quantum/agent/netns_cleanup_util.py b/quantum/agent/netns_cleanup_util.py
index 66c749186..81c81b1c0 100644
--- a/quantum/agent/netns_cleanup_util.py
+++ b/quantum/agent/netns_cleanup_util.py
@@ -56,16 +56,20 @@ def setup_conf():
     from the main config that do not apply during clean-up.
     """
 
+    cli_opts = [
+        cfg.BoolOpt('force',
+                    default=False,
+                    help=_('Delete the namespace by removing all devices.')),
+    ]
+
     opts = [
         cfg.StrOpt('dhcp_driver',
                    default='quantum.agent.linux.dhcp.Dnsmasq',
                    help=_("The driver used to manage the DHCP server.")),
-        cfg.BoolOpt('force',
-                    default=False,
-                    help=_('Delete the namespace by removing all devices.')),
     ]
 
     conf = cfg.CONF
+    conf.register_cli_opts(cli_opts)
     conf.register_opts(opts)
     agent_config.register_root_helper(conf)
     conf.register_opts(dhcp.OPTS)