diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-16 14:42:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-16 14:42:17 +0000 |
| commit | bbf2f7e697f785fa5d95ddc80020026cf2d9890f (patch) | |
| tree | 38edf5c4103a604bfe28ee63acbbf380917eefdb | |
| parent | d81ed84a634fcd88a0ecaf728c9fd1d405d9946e (diff) | |
| parent | d819f869c5a535f115f0cafa47e7d21a3e129605 (diff) | |
| download | nova-bbf2f7e697f785fa5d95ddc80020026cf2d9890f.tar.gz nova-bbf2f7e697f785fa5d95ddc80020026cf2d9890f.tar.xz nova-bbf2f7e697f785fa5d95ddc80020026cf2d9890f.zip | |
Merge "Copy the RHEL6 eventlet workaround from Oslo"
| -rw-r--r-- | openstack-common.conf | 2 | ||||
| -rw-r--r-- | tools/patch_tox_venv.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/openstack-common.conf b/openstack-common.conf index fb6cd4d78..24c306181 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -19,10 +19,12 @@ module=log module=loopingcall module=network_utils module=notifier +module=patch_tox_venv module=periodic_task module=plugin module=policy module=processutils +module=redhat-eventlet.patch module=rootwrap module=rpc module=strutils diff --git a/tools/patch_tox_venv.py b/tools/patch_tox_venv.py index 399acbcfc..6ae6c2e7f 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 = 'Nova' + project = 'nova' 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) |