x/vmware-nsx
Code Issues Proposed changes

Merge "make neutron-ns-metadata-proxy configurable"

Browse Source
This commit is contained in:
Jenkins 2013-08-22 02:31:59 +00:00 committed by Gerrit Code Review
commit 486c48f975
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/agent/dhcp_agent.py
View File

@ -67,6 +67,10 @@ class DhcpAgent(manager.Manager):
"enable_isolated_metadata = True")), "enable_isolated_metadata = True")),
cfg.IntOpt('num_sync_threads', default=4, cfg.IntOpt('num_sync_threads', default=4,
help=_('Number of threads to use during sync process.')), help=_('Number of threads to use during sync process.')),
cfg.StrOpt('metadata_proxy_socket',
default='$state_path/metadata_proxy',
help=_('Location of Metadata Proxy UNIX domain '
'socket')),
] ]
def __init__(self, host=None): def __init__(self, host=None):
@ -345,8 +349,10 @@ class DhcpAgent(manager.Manager):
router_ports[0].device_id) router_ports[0].device_id)
def callback(pid_file): def callback(pid_file):
metadata_proxy_socket = cfg.CONF.metadata_proxy_socket
proxy_cmd = ['neutron-ns-metadata-proxy', proxy_cmd = ['neutron-ns-metadata-proxy',
'--pid_file=%s' % pid_file, '--pid_file=%s' % pid_file,
'--metadata_proxy_socket=%s' % metadata_proxy_socket,
neutron_lookup_param, neutron_lookup_param,
'--state_path=%s' % self.conf.state_path, '--state_path=%s' % self.conf.state_path,
'--metadata_port=%d' % METADATA_PORT] '--metadata_port=%d' % METADATA_PORT]

6
neutron/agent/l3_agent.py
View File

@ -181,6 +181,10 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, manager.Manager):
"by the agents.")), "by the agents.")),
cfg.BoolOpt('enable_metadata_proxy', default=True, cfg.BoolOpt('enable_metadata_proxy', default=True,
help=_("Allow running metadata proxy.")), help=_("Allow running metadata proxy.")),
cfg.StrOpt('metadata_proxy_socket',
default='$state_path/metadata_proxy',
help=_('Location of Metadata Proxy UNIX domain '
'socket')),
] ]
def __init__(self, host, conf=None): def __init__(self, host, conf=None):
@ -304,8 +308,10 @@ class L3NATAgent(firewall_l3_agent.FWaaSL3AgentRpcCallback, manager.Manager):
def _spawn_metadata_proxy(self, router_info): def _spawn_metadata_proxy(self, router_info):
def callback(pid_file): def callback(pid_file):
metadata_proxy_socket = cfg.CONF.metadata_proxy_socket
proxy_cmd = ['neutron-ns-metadata-proxy', proxy_cmd = ['neutron-ns-metadata-proxy',
'--pid_file=%s' % pid_file, '--pid_file=%s' % pid_file,
'--metadata_proxy_socket=%s' % metadata_proxy_socket,
'--router_id=%s' % router_info.router_id, '--router_id=%s' % router_info.router_id,
'--state_path=%s' % self.conf.state_path, '--state_path=%s' % self.conf.state_path,
'--metadata_port=%s' % self.conf.metadata_port] '--metadata_port=%s' % self.conf.metadata_port]

11
neutron/agent/metadata/namespace_proxy.py
View File

@ -31,13 +31,6 @@ from neutron.common import utils
from neutron.openstack.common import log as logging from neutron.openstack.common import log as logging
from neutron import wsgi from neutron import wsgi
proxy_socket = cfg.StrOpt('metadata_proxy_socket',
default='$state_path/metadata_proxy',
help=_('Location of Metadata Proxy UNIX domain '
'socket'))
cfg.CONF.register_opt(proxy_socket)
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@ -157,6 +150,10 @@ def main():
default=9697, default=9697,
help=_("TCP Port to listen for metadata server " help=_("TCP Port to listen for metadata server "
"requests.")), "requests.")),
cfg.StrOpt('metadata_proxy_socket',
default='$state_path/metadata_proxy',
help=_('Location of Metadata Proxy UNIX domain '
'socket'))
] ]
cfg.CONF.register_cli_opts(opts) cfg.CONF.register_cli_opts(opts)

1
neutron/tests/unit/test_dhcp_agent.py
View File

@ -601,6 +601,7 @@ class TestDhcpAgentEventHandler(base.BaseTestCase):
mock.call().netns.execute([ mock.call().netns.execute([
'neutron-ns-metadata-proxy', 'neutron-ns-metadata-proxy',
mock.ANY, mock.ANY,
mock.ANY,
'--router_id=forzanapoli', '--router_id=forzanapoli',
mock.ANY, mock.ANY,
mock.ANY, mock.ANY,

1
neutron/tests/unit/test_l3_agent.py
View File

@ -690,6 +690,7 @@ class TestL3AgentEventHandler(base.BaseTestCase):
mock.call().netns.execute([ mock.call().netns.execute([
'neutron-ns-metadata-proxy', 'neutron-ns-metadata-proxy',
mock.ANY, mock.ANY,
mock.ANY,
'--router_id=%s' % router_id, '--router_id=%s' % router_id,
mock.ANY, mock.ANY,
'--metadata_port=%s' % metadata_port, '--metadata_port=%s' % metadata_port,