From: Mark McLoughlin Date: Thu, 2 May 2013 09:31:16 +0000 (+0100) Subject: Copy the RHEL6 eventlet workaround from Oslo X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=9581e5b71b6c7807a8897ddd0a4dc3556462d96b;p=openstack-build%2Fneutron-build.git 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 bbae3520a..6bcdc00d6 100644 --- 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 bcd1fc580..5f09939cf 100644 --- 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)