Copy the RHEL6 eventlet workaround from Oslo

Tests in oslo-incubator now need the horrendous hack to workaround an
issue with eventlet on RHEL6. We've moved the patch_tox_venv tool
and redhat-eventlet.patch into oslo-incubator, so add them to
openstack-common.conf.

Change-Id: I1acfec282b64d7582144b155119bedb1741db2f7

diff --git a/openstack-common.conf b/openstack-common.conf
index bbae3520ac7cb37ab3c1e070ed30e55607e2ff47..6bcdc00d6e597c008bb65c6bbaa05aae25092a90 100644 (file)
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -15,9 +15,11 @@ module=log
 module=loopingcall
 module=network_utils
 module=notifier
+module=patch_tox_venv
 module=periodic_task
 module=policy
 module=processutils
+module=redhat-eventlet.patch
 module=rpc
 module=service
 module=setup

diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py
index bcd1fc580477f39e2e231cafc4eabb61f85f08e3..5f09939cfab6257248258ccd0e5d7dedc9f08d8e 100644 (file)
--- a/tools/patch_tox_venv.py
+++ b/tools/patch_tox_venv.py
@@ -28,7 +28,7 @@ def main(argv):
     pip_requires = os.path.join(root, 'tools', 'pip-requires')
     test_requires = os.path.join(root, 'tools', 'test-requires')
     py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
-    project = 'Quantum'
+    project = 'quantum'
     install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
                                        py_version, project)
     #NOTE(dprince): For Tox we only run post_process (which patches files, etc)