From: Dongcan Ye Date: Mon, 9 Nov 2015 04:53:28 +0000 (+0800) Subject: Trivial fix in l3 agent X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=d18833dd6a703cac0042c7c06cc36a4b24d3f3d8;p=openstack-build%2Fneutron-build.git Trivial fix in l3 agent Remove unnecessary blank line and keep consistence about blank space in l3 config. Change-Id: Ia69393db85aacabad266f056995c15f043f32bfb --- diff --git a/neutron/agent/l3/config.py b/neutron/agent/l3/config.py index ef794f572..69c605546 100644 --- a/neutron/agent/l3/config.py +++ b/neutron/agent/l3/config.py @@ -43,16 +43,14 @@ OPTS = [ "in the M release.")), cfg.PortOpt('metadata_port', default=9697, - help=_("TCP Port used by Neutron metadata namespace " - "proxy.")), + help=_("TCP Port used by Neutron metadata namespace proxy.")), cfg.IntOpt('send_arp_for_ha', default=3, help=_("Send this many gratuitous ARPs for HA setup, if " "less than or equal to 0, the feature is disabled")), cfg.StrOpt('router_id', default='', - help=_("If namespaces is disabled, the l3 agent can only" - " configure a router that has the matching router " - "ID.")), + help=_("If namespaces is disabled, the l3 agent can only " + "configure a router that has the matching router ID.")), cfg.BoolOpt('handle_internal_only_routers', default=True, help=_("Agent should implement routers with no gateway")), diff --git a/neutron/agent/l3/namespace_manager.py b/neutron/agent/l3/namespace_manager.py index 24e665533..0b9f42ac1 100644 --- a/neutron/agent/l3/namespace_manager.py +++ b/neutron/agent/l3/namespace_manager.py @@ -117,7 +117,6 @@ class NamespaceManager(object): """Get a set of all namespaces on host managed by this manager.""" try: root_ip = ip_lib.IPWrapper() - namespaces = root_ip.get_namespaces() return set(ns for ns in namespaces if self.is_managed(ns)) except RuntimeError: