Merge "Import "oslo_config.cfg" before "eventlet"" into stable/stein
This commit is contained in:
commit
77a213b0bd
|
@ -15,6 +15,8 @@
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
from oslo_config import cfg # noqa
|
||||||
|
|
||||||
from neutron.common import eventlet_utils
|
from neutron.common import eventlet_utils
|
||||||
from neutron.tests.common.agents import l3_agent
|
from neutron.tests.common.agents import l3_agent
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ from __future__ import print_function
|
||||||
|
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
import eventlet
|
from oslo_config import cfg # noqa
|
||||||
|
|
||||||
|
|
||||||
def print_binary_name():
|
def print_binary_name():
|
||||||
|
@ -33,6 +33,9 @@ def print_binary_name():
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|
||||||
|
import eventlet
|
||||||
|
|
||||||
if 'spawn' in sys.argv:
|
if 'spawn' in sys.argv:
|
||||||
eventlet.spawn(print_binary_name).wait()
|
eventlet.spawn(print_binary_name).wait()
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in New Issue