diff --git a/requirements.txt b/requirements.txt index 08c0af534..6bc05760b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,6 @@ keystoneauth1>=2.20.0 # Apache-2.0 netifaces>=0.10.4 # MIT python-novaclient>=7.1.0 # Apache-2.0 python-keystoneclient>=3.8.0 # Apache-2.0 -python-cinderclient>=2.0.1 # Apache-2.0 python-ironicclient>=1.11.0 # Apache-2.0 python-designateclient>=1.5.0 # Apache-2.0 diff --git a/shade/openstackcloud.py b/shade/openstackcloud.py index d6ba69f7a..0daacf313 100644 --- a/shade/openstackcloud.py +++ b/shade/openstackcloud.py @@ -31,7 +31,6 @@ import munch import requestsexceptions from six.moves import urllib -import cinderclient.exceptions as cinder_exceptions import keystoneauth1.exceptions import novaclient.exceptions as nova_exceptions @@ -652,11 +651,8 @@ class OpenStackCloud(_normalize.Normalizer): @property def cinder_client(self): - - # Import cinderclient late because importing it at the top level - # breaks logging for users of shade - import cinderclient.client # flake8: noqa if self._cinder_client is None: + _deprecated_import_check('cinderclient') self._cinder_client = self._get_client('volume') return self._cinder_client