Merge "Replace exit() by sys.exit()"
This commit is contained in:
commit
15b04c317b
|
@ -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)
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
Loading…
Reference in New Issue