From: Zack Cerza <zack@redhat.com>
Date: Tue, 19 Apr 2016 20:12:06 +0000 (-0600)
Subject: Work around pip dependency issue w/ nova and Babel
X-Git-Tag: 1.1.0~625^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea69e1af47d02aabbb982f0cb9e9017af5f2713b;p=teuthology.git

Work around pip dependency issue w/ nova and Babel

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/setup.py b/setup.py
index ae368af2b..18c7de376 100644
--- a/setup.py
+++ b/setup.py
@@ -72,6 +72,11 @@ setup(
                       'pyopenssl>=0.13',
                       'ndg-httpsclient',
                       'pyasn1',
+                      # python-novaclient is specified here, even though it is
+                      # redundant, because python-openstackclient requires
+                      # Babel, and installs 2.3.3, which is forbidden by
+                      # python-novaclient 4.0.0
+                      'python-novaclient',
                       'python-openstackclient',
                       # with openstacklient >= 2.1.0, neutronclient no longer is
                       # a dependency but we need it anyway.