equal
deleted
inserted
replaced
26 |
26 |
27 from oslo.config import cfg |
27 from oslo.config import cfg |
28 |
28 |
29 from neutron.agent.common import config |
29 from neutron.agent.common import config |
30 from neutron.agent import l3_agent |
30 from neutron.agent import l3_agent |
|
31 from neutron.agent.linux import external_process |
31 from neutron.agent.linux import utils |
32 from neutron.agent.linux import utils |
32 from neutron.agent.solaris import interface |
33 from neutron.agent.solaris import interface |
33 from neutron.agent.solaris import net_lib |
34 from neutron.agent.solaris import net_lib |
34 from neutron.agent.solaris import ra |
35 from neutron.agent.solaris import ra |
35 from neutron.common import constants as l3_constants |
36 from neutron.common import constants as l3_constants |
78 self.process_router(ri) |
79 self.process_router(ri) |
79 if self.conf.enable_metadata_proxy: |
80 if self.conf.enable_metadata_proxy: |
80 self._destroy_metadata_proxy(ri.router_id, ri.ns_name) |
81 self._destroy_metadata_proxy(ri.router_id, ri.ns_name) |
81 |
82 |
82 del self.router_info[router_id] |
83 del self.router_info[router_id] |
|
84 |
|
85 def _get_metadata_proxy_process_manager(self, router_id, ns_name): |
|
86 return external_process.ProcessManager( |
|
87 self.conf, |
|
88 router_id, |
|
89 root_helper=None, |
|
90 namespace=ns_name) |
83 |
91 |
84 def _get_metadata_proxy_callback(self, router_id): |
92 def _get_metadata_proxy_callback(self, router_id): |
85 """Need to override this since we need to pass the absolute |
93 """Need to override this since we need to pass the absolute |
86 path to neutron-ns-metadata-proxy binary. |
94 path to neutron-ns-metadata-proxy binary. |
87 """ |
95 """ |