pylint error

saltstack · Dec 11, 2019 · c046bd1 · c046bd1
1 parent 8720fdc
commit c046bd1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/salt/modules/nova.py b/salt/modules/nova.py
@@ -87,6 +87,7 @@
     HAS_NOVA = True
 except NameError as exc:
     HAS_NOVA = False
+
 # Define the module's virtual name
 __virtualname__ = 'nova'
 

diff --git a/salt/utils/openstack/nova.py b/salt/utils/openstack/nova.py
@@ -78,6 +78,12 @@ def check_nova():
                   NOVACLIENT_MINVER)
     return False
 
+if check_nova():
+    try:
+        import novaclient.auth_plugin
+    except ImportError:
+        log.debug('Using novaclient version 7.0.0 or newer. Authentication '
+                  'plugin auth_plugin.py is not available anymore.')
 
 # kwargs has to be an object instead of a dictionary for the __post_parse_arg__
 class KwargsStruct(object):