Merge pull request #25248 from techhat/issue22391

Do not resize while iterating
saltstack · Jul 8, 2015 · 679cdba · 679cdba
2 parents 631cee1 + 4f2abe5
commit 679cdba
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/salt/cloud/clouds/joyent.py b/salt/cloud/clouds/joyent.py
@@ -690,10 +690,14 @@ def reformat_node(item=None, full=False):
             item[key] = None
 
     # remove all the extra key value pairs to provide a brief listing
+    to_del = []
     if not full:
         for key in six.iterkeys(item):  # iterate over a copy of the keys
             if key not in desired_keys:
-                del item[key]
+                to_del.append(key)
+
+    for key in to_del:
+        del item[key]
 
     if 'state' in item:
         item['state'] = joyent_node_state(item['state'])