Merge "Import "oslo_config.cfg" before "eventlet"" into stable/rocky

neutron/tests/fullstack/cmd/l3_agent.py

@@ -15,6 +15,8 @@
 
 import sys
 
+from oslo_config import cfg  # noqa
+
 from neutron.common import eventlet_utils
 from neutron.tests.common.agents import l3_agent
 

neutron/tests/functional/agent/linux/bin/ipt_binname.py

@@ -20,7 +20,7 @@ from __future__ import print_function
 
 import sys
 
-import eventlet
+from oslo_config import cfg  # noqa
 
 
 def print_binary_name():
@@ -33,6 +33,9 @@ def print_binary_name():
 
 
 if __name__ == "__main__":
+
+    import eventlet
+
     if 'spawn' in sys.argv:
         eventlet.spawn(print_binary_name).wait()
     else: