Handle a couple of arguments better (Azure) (#32683)

saltstack · Apr 19, 2016 · 7cdd512 · 7cdd512
1 parent aaa03bc
commit 7cdd512
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/salt/cloud/clouds/msazure.py b/salt/cloud/clouds/msazure.py
@@ -223,7 +223,7 @@ def list_nodes(conn=None, call=None):
     for node in nodes:
         ret[node] = {'name': node}
         for prop in ('id', 'image', 'size', 'state', 'private_ips', 'public_ips'):
-            ret[node][prop] = nodes[node][prop]
+            ret[node][prop] = nodes[node].get(prop)
     return ret
 
 
@@ -571,6 +571,7 @@ def create(vm_):
         # Deleting two useless keywords
         del vm_kwargs['deployment_slot']
         del vm_kwargs['label']
+        del vm_kwargs['virtual_network_name']
         result = conn.add_role(**vm_kwargs)
         _wait_for_async(conn, result.request_id)
     except Exception as exc: