From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 20 Mar 2015 01:44:05 +0000 (+0000)
Subject: Merge "Adding a cleanup for 'fip-' and 'snat-' namespaces in netns_cleanup"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=81ce60ea7b0dab58bfea36bf4c0406597fc19994;p=openstack-build%2Fneutron-build.git

Merge "Adding a cleanup for 'fip-' and 'snat-' namespaces in netns_cleanup"
---

81ce60ea7b0dab58bfea36bf4c0406597fc19994
diff --cc neutron/cmd/netns_cleanup.py
index bacef3d28,976a39e11..41ca1edd6
--- a/neutron/cmd/netns_cleanup.py
+++ b/neutron/cmd/netns_cleanup.py
@@@ -23,8 -23,9 +23,10 @@@ from oslo_utils import importutil
  from neutron.agent.common import config as agent_config
  from neutron.agent.dhcp import config as dhcp_config
  from neutron.agent.l3 import agent as l3_agent
+ from neutron.agent.l3 import dvr
+ from neutron.agent.l3 import dvr_fip_ns
  from neutron.agent.linux import dhcp
 +from neutron.agent.linux import external_process
  from neutron.agent.linux import interface
  from neutron.agent.linux import ip_lib
  from neutron.agent.linux import ovs_lib