commit 2724ebef454bc65a21c95c3f2bcee64f326a4a79
author mcp-jenkins <mcp-jenkins@mirantis.com> Fri Feb 08 07:46:26 2019 +0000
committer Gerrit Code Review <mail@domain.com> Fri Feb 08 07:46:26 2019 +0000
tree af76ec25a5ea9e6df3331f3a3bfbe6f173cdb70a
parent f4b9219b501a3be12851259e66530c2d4be94c5c
parent ce6159b430d455b3febdf039138c1ce074de9b39

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

_modules/octaviav2/common.py

diff --git a/_modules/octaviav2/common.py b/_modules/octaviav2/common.py
index 7cccf0b..ddc8138 100644
--- a/_modules/octaviav2/common.py
+++ b/_modules/octaviav2/common.py
@@ -1,7 +1,13 @@
 import logging
-import os_client_config
 from uuid import UUID
 
+try:
+    import os_client_config
+except ImportError:
+    os_client_config = None
+from salt import exceptions
+
+
 log = logging.getLogger(__name__)
 
 
@@ -39,6 +45,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 = 'load-balancer'
     config = os_client_config.OpenStackConfig()
     cloud = config.get_one_cloud(cloud_name)