x/vmware-nsx
Code Issues Proposed changes

Merge "Change the quantum-ns-metadata-proxy log file name."

Browse Source
This commit is contained in:
Jenkins 2013-03-28 07:28:42 +00:00 committed by Gerrit Code Review
commit d160d22f9c
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/agent/dhcp_agent.py
View File

@ -318,7 +318,7 @@ class DhcpAgent(manager.Manager):
'--state_path=%s' % self.conf.state_path, '--state_path=%s' % self.conf.state_path,
'--metadata_port=%d' % METADATA_PORT] '--metadata_port=%d' % METADATA_PORT]
proxy_cmd.extend(config.get_log_args( proxy_cmd.extend(config.get_log_args(
cfg.CONF, 'quantum-ns-metadata-proxy%s.log' % network.id)) cfg.CONF, 'quantum-ns-metadata-proxy-%s.log' % network.id))
return proxy_cmd return proxy_cmd
pm = external_process.ProcessManager( pm = external_process.ProcessManager(

2
quantum/agent/l3_agent.py
View File

@ -260,7 +260,7 @@ class L3NATAgent(manager.Manager):
'--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]
proxy_cmd.extend(config.get_log_args( proxy_cmd.extend(config.get_log_args(
cfg.CONF, 'quantum-ns-metadata-proxy%s.log' % cfg.CONF, 'quantum-ns-metadata-proxy-%s.log' %
router_info.router_id)) router_info.router_id))
return proxy_cmd return proxy_cmd

2
quantum/tests/unit/test_dhcp_agent.py
View File

@ -575,7 +575,7 @@ class TestDhcpAgentEventHandler(base.BaseTestCase):
mock.ANY, mock.ANY,
mock.ANY, mock.ANY,
'--debug', '--debug',
('--log-file=quantum-ns-metadata-proxy%s.log' % ('--log-file=quantum-ns-metadata-proxy-%s.log' %
fake_meta_network.id)]) fake_meta_network.id)])
]) ])
finally: finally: