From 27e7ad0bd9f2cdf12d0617cb0e90d3788d8f8fbc Mon Sep 17 00:00:00 2001
From: Matt Riedemann <mriedem@us.ibm.com>
Date: Wed, 28 Oct 2015 17:00:46 -0700
Subject: [PATCH] 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
---
cinder/compute/nova.py | 4 ++--
requirements.txt | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/cinder/compute/nova.py b/cinder/compute/nova.py
index 98101210b89..58a349da5f3 100644
--- 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 02cd1b172b7..59a36eba21f 100644
--- 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