Merge pull request #27430 from jacksontj/2015.8

Fix bug introduced in eee0291ff8
This commit is contained in:
Joseph Hall 2015-09-25 19:09:40 -06:00
commit 333c305ba0
2 changed files with 2 additions and 2 deletions

View file

@ -220,7 +220,7 @@ def list_nodes(full=False, call=None):
for node in nodes:
ret[node] = {}
for item in 'id', 'image', 'size', 'public_ips', 'private_ips', 'state':
for item in ('id', 'image', 'size', 'public_ips', 'private_ips', 'state'):
ret[node][item] = nodes[node][item]
return ret

View file

@ -222,7 +222,7 @@ def list_nodes(conn=None, call=None):
nodes = list_nodes_full(conn, call)
for node in nodes:
ret[node] = {}
for prop in 'id', 'image', 'name', 'size', 'state', 'private_ips', 'public_ips':
for prop in ('id', 'image', 'name', 'size', 'state', 'private_ips', 'public_ips'):
ret[node][prop] = nodes[node][prop]
return ret