openstack
/
neutron
Code Issues Proposed changes

Merge "Replace exit() by sys.exit()"

This commit is contained in:
Jenkins 2016-01-25 13:52:22 +00:00 committed by Gerrit Code Review
parent d56b5a6718 cccd78f8d1
commit 15b04c317b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
View File

@ -889,7 +889,7 @@ class LinuxBridgeNeutronAgentRPC(service.Service):
else:
LOG.error(_LE("Unable to obtain MAC address for unique ID. "
"Agent terminated!"))
exit(1)
sys.exit(1)
self.plugin_rpc = agent_rpc.PluginApi(topics.PLUGIN)
self.sg_plugin_rpc = sg_rpc.SecurityGroupServerRpcApi(topics.PLUGIN)

2
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
View File

@ -1016,7 +1016,7 @@ class OVSNeutronAgent(sg_rpc.SecurityGroupAgentRpcCallbackMixin,
"tunneling enabled on this agent, since this "
"version of OVS does not support tunnels or patch "
"ports. Agent terminated!"))
exit(1)
sys.exit(1)
if self.conf.AGENT.drop_flows_on_start:
self.tun_br.delete_flows()