Fix a conflict with openstack requirements

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

diff --git a/setup.py b/setup.py
index 4f608215088bcac51a23a9c22f251ec53ea5ed72..8754f4cf9f39edc2ca45a5485d2d6bda268f7b5e 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -76,16 +76,15 @@ setup(
                       'pyopenssl>=0.13',
                       'ndg-httpsclient',
                       'pyasn1',
-                      # Work around regression in 0.9.2 that caused
-                      # `openstack ip floating list -f json` to fail and return
-                      # "Connection failure that may be retried."
-                      'openstacksdk != 0.9.2',
                       # 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',
+                      # Copy the below from python-openstackclient's
+                      # requirements to avoid a conflict
+                      'openstacksdk!=0.9.11,!=0.9.12,>=0.9.10',
                       # with openstacklient >= 2.1.0, neutronclient no longer is
                       # a dependency but we need it anyway.
                       'python-neutronclient',