Merge pull request #7 from blissend/master

fix #6 - Fixes for virtual and virtual subtypes.
device42 · Sep 21, 2019 · 9ed1895 · 9ed1895
2 parents fc9d896 + cd3df72
commit 9ed1895
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/saltexplore.py b/saltexplore.py
@@ -75,7 +75,7 @@ def d42_insert(dev42, nodes, options, static_opt):
     for node in [nodes[x] for x in nodes]:
         if not node:
             logger.debug("Skip node: no proper node data")
-            continue 
+            continue
         if 'nodename' not in node:
             logger.debug("Skip node: no name found")
             continue
@@ -127,14 +127,16 @@ def d42_insert(dev42, nodes, options, static_opt):
             if serial_no:
                 data.update({'serial_no': serial_no})
 
-            nodetype = None
+            nodetype = 'physical'
             virtual_subtype = None
             is_virtual = 'no'
-            if 'virtual' in node and node['virtual'] is not None:
+            if node['virtual'] != nodetype:
                 is_virtual = 'yes'
                 nodetype = 'virtual'
                 if 'virtual_subtype' in node:
                     virtual_subtype = node['virtual_subtype']
+                else:
+                    virtual_subtype = node['virtual']
 
             if virtual_subtype is not None:
                 data.update({'virtual_subtype': virtual_subtype})
@@ -280,7 +282,7 @@ def main():
     for node in salt_nodes:
         try:
             if not node:
-                continue 
+                continue
             if type(salt_nodes[node]) != dict:
                 continue
             salt_nodes[node]['disks'] = local.cmd(node, 'disk.blkid')