Revert "Handle correct exception raised by python-novaclient"

This reverts commit 99dc6d34754954a27f6998406a94743c41b93981

With the block on novaclient 2.33 we can undo this workaround.
The regression in novaclient was reverted and will be in the next
release.

Change-Id: If561b699eb04486660009f100c5db425c3586d3c
Related-Bug: #1510790

diff --git a/cinder/compute/nova.py b/cinder/compute/nova.py
index 98101210b89590d2ed15255a974ed55cf10fb19f..58a349da5f32458cbc12e47966a8de083ec4173b 100644 (file)
--- a/cinder/compute/nova.py
+++ b/cinder/compute/nova.py
@@ -163,7 +163,7 @@ class API(base.Base):
     def has_extension(self, context, extension, timeout=None):
         try:
             nova_exts = nova_client.discover_extensions(NOVA_API_VERSION)
-        except (nova_exceptions.RequestTimeout, request_exceptions.Timeout):
+        except request_exceptions.Timeout:
             raise exception.APITimeout(service='Nova')
         return extension in [e.name for e in nova_exts]
 
@@ -196,5 +196,5 @@ class API(base.Base):
                               timeout=timeout).servers.get(server_id)
         except nova_exceptions.NotFound:
             raise exception.ServerNotFound(uuid=server_id)
-        except (nova_exceptions.RequestTimeout, request_exceptions.Timeout):
+        except request_exceptions.Timeout:
             raise exception.APITimeout(service='Nova')

diff --git a/requirements.txt b/requirements.txt
index 02cd1b172b7e4f4dac4ee6951bebca0bc24580e4..59a36eba21fa5e0229690cdb1158ec022c687921 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -35,7 +35,7 @@ pycrypto>=2.6
 pyparsing>=2.0.1
 python-barbicanclient>=3.3.0
 python-glanceclient>=0.18.0
-python-novaclient>=2.29.0
+python-novaclient!=2.33.0,>=2.29.0
 python-swiftclient>=2.2.0
 requests!=2.8.0,>=2.5.2
 retrying!=1.3.0,>=1.2.3 # Apache-2.0