diff options
| author | Zuul <zuul@review.opendev.org> | 2020-09-04 02:45:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-09-04 02:45:47 +0000 |
| commit | 76f2b91d9add6113aa57829d8101647f0a5936d7 (patch) | |
| tree | 376692e07d977292bef2e216798be0f9fa7ae46c /cinderclient/shell.py | |
| parent | 9dc1d61d3276d32b455340559ed574de27e29040 (diff) | |
| parent | f85896af2b044abc2c966f874414b38aae5b0d06 (diff) | |
| download | python-cinderclient-76f2b91d9add6113aa57829d8101647f0a5936d7.tar.gz | |
Merge "[goal] Migrate python-cinderclient jobs to focal"
Diffstat (limited to 'cinderclient/shell.py')
| -rw-r--r-- | cinderclient/shell.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cinderclient/shell.py b/cinderclient/shell.py index 7722556..cfd4e82 100644 --- a/cinderclient/shell.py +++ b/cinderclient/shell.py @@ -31,10 +31,6 @@ from keystoneauth1 import loading from keystoneauth1 import session from oslo_utils import encodeutils from oslo_utils import importutils -try: - osprofiler_profiler = importutils.try_import("osprofiler.profiler") -except Exception: - pass import requests import six import six.moves.urllib.parse as urlparse @@ -46,6 +42,11 @@ from cinderclient import client from cinderclient import exceptions as exc from cinderclient import utils +try: + osprofiler_profiler = importutils.try_import("osprofiler.profiler") +except Exception: + pass + DEFAULT_MAJOR_OS_VOLUME_API_VERSION = "3" DEFAULT_CINDER_ENDPOINT_TYPE = 'publicURL' |