2 files changed, 9 insertions, 1 deletions

diff --git a/requirements.txt b/requirements.txt
index 5fa919fc..122d8896 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@ cliff>=1.4.3
 keyring>=2.1
 pycrypto>=2.6
 python-glanceclient>=0.9.0
-python-keystoneclient>=0.7.0
+python-keystoneclient>=0.8.0
 python-novaclient>=2.17.0
 python-cinderclient>=1.0.6
 requests>=1.1
diff --git a/setup.py b/setup.py
index 70c2b3f3..73637574 100644
--- a/setup.py
+++ b/setup.py
@@ -17,6 +17,14 @@
 # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT
 import setuptools
 
+# In python < 2.7.4, a lazy loading of package `pbr` will break
+# setuptools if some other modules registered functions in `atexit`.
+# solution from: http://bugs.python.org/issue15881#msg170215
+try:
+    import multiprocessing  # noqa
+except ImportError:
+    pass
+
 setuptools.setup(
     setup_requires=['pbr'],
     pbr=True)