Make cinderclient a more optional dependency

This catches import errors around cinderclient imports in the cinder store.
Since python-cinderclient was moved to test-requirements.txt, it is not
installed in the main glance gate jobs. This caused a lot of errors in the
logs, which should be avoided.

Change-Id: Iec6ac7020f66f9f9728d6cf4452127b8d55a8b2d
Closes-Bug: #1471063

1 files changed, 9 insertions, 3 deletions

diff --git a/glance_store/_drivers/cinder.py b/glance_store/_drivers/cinder.py
index ab9e284..66829ea 100644
--- a/glance_store/_drivers/cinder.py
+++ b/glance_store/_drivers/cinder.py
@@ -14,9 +14,6 @@
 
 import logging
 
-from cinderclient import exceptions as cinder_exception
-from cinderclient import service_catalog
-from cinderclient.v2 import client as cinderclient
 from oslo_config import cfg
 from oslo_utils import units
 
@@ -27,6 +24,15 @@ from glance_store import exceptions
 from glance_store.i18n import _
 import glance_store.location
 
+try:
+    from cinderclient import exceptions as cinder_exception
+    from cinderclient import service_catalog
+    from cinderclient.v2 import client as cinderclient
+except ImportError:
+    cinder_exception = None
+    service_catalog = None
+    cinderclient = None
+
 LOG = logging.getLogger(__name__)
 
 _CINDER_OPTS = [