commit 67731250c5c59911c543bae87e0d7c83587b3082
author mcp-jenkins <mcp-jenkins@mirantis.com> Sun Feb 10 21:40:10 2019 +0000
committer Gerrit Code Review <mail@domain.com> Sun Feb 10 21:40:10 2019 +0000
tree f1b5303e6f17f522b0cc9ad88d0007c343b83c30
parent bb6070006f2f208d6487ec02e97114d9d74890d6
parent b110da937403ce46f98942414b38def7be386f50

Merge "Don't fall when just loading cinderv3 modules"

_modules/cinderv3/common.py

diff --git a/_modules/cinderv3/common.py b/_modules/cinderv3/common.py
index df419e9..e039f87 100644
--- a/_modules/cinderv3/common.py
+++ b/_modules/cinderv3/common.py
@@ -1,6 +1,11 @@
 import time
 import logging
-import os_client_config
+
+try:
+    import os_client_config
+except ImportError:
+    os_client_config = None
+from salt import exceptions
 
 log = logging.getLogger(__name__)
 
@@ -43,6 +48,10 @@
 
 
 def _get_raw_client(cloud_name):
+    if not os_client_config:
+        raise exceptions.SaltInvocationError(
+            "Cannot load os-client-config. Please check your environment "
+            "configuration.")
     service_type = 'volumev3'
     config = os_client_config.OpenStackConfig()
     cloud = config.get_one_cloud(cloud_name)