From d52a0f21f7f31c2445143d7e95a68aecf4ee57c5 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Thu, 2 May 2013 10:22:26 +0100
Subject: [PATCH] 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
---
contrib/redhat-eventlet.patch | 4 ++--
openstack-common.conf | 2 ++
tools/patch_tox_venv.py | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/contrib/redhat-eventlet.patch b/contrib/redhat-eventlet.patch
index 0b77e6f72cc..cf2ff53d510 100644
--- a/contrib/redhat-eventlet.patch
+++ b/contrib/redhat-eventlet.patch
@@ -1,7 +1,7 @@
---- .cinder-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py.orig
+--- .nova-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py.orig
2011-05-25
23:31:34.597271402 +0000
-+++ .cinder-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py
++++ .nova-venv/lib/python2.6/site-packages/eventlet/green/subprocess.py
2011-05-25
23:33:24.055602468 +0000
@@ -32,7 +32,7 @@
diff --git a/openstack-common.conf b/openstack-common.conf
index a1a35b76b10..19f6ce0b480 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -15,8 +15,10 @@ module=lockutils
module=log
module=network_utils
module=notifier
+module=patch_tox_venv
module=policy
module=processutils
+module=redhat-eventlet.patch
module=rootwrap
module=rpc
module=scheduler
diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py
index ce4b19b5908..dc87af99f7f 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 = 'Cinder'
+ project = 'cinder'
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)