saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add 'name' to the output of salt-cloud -Q commands, where needed, for consistency.

Browse source
This commit is contained in:
rallytime 2015-09-14 14:28:05 -06:00
parent 860de8d877
commit 4b27aef406
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
salt/cloud/clouds/ec2.py
View file

@ -3188,6 +3188,7 @@ def list_nodes(call=None):
ret[node] = {
'id': nodes[node]['id'],
'image': nodes[node]['image'],
'name': nodes[node]['name'],
'size': nodes[node]['size'],
'state': nodes[node]['state'],
'private_ips': nodes[node]['private_ips'],

2
salt/cloud/clouds/msazure.py
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', '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

1
salt/cloud/libcloudfuncs.py
View file

@ -436,6 +436,7 @@ def list_nodes(conn=None, call=None):
ret[node.name] = {
'id': node.id,
'image': node.image,
'name': node.name,
'private_ips': node.private_ips,
'public_ips': node.public_ips,
'size': node.size,