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

Make sure we set the full data to the ret variable

Browse source
This commit is contained in:
rallytime 2015-09-17 17:54:09 -06:00
parent 9b635004e2
commit 808a5b3b81
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/cloud/clouds/digital_ocean.py
View file

@ -804,7 +804,7 @@ def _list_nodes(full=False, for_output=False):
name = node['name']
ret[name] = {}
if full:
_get_full_output(node, for_output=for_output)
ret[name] = _get_full_output(node, for_output=for_output)
else:
public_ips, private_ips = _get_ips(node['networks'])
ret[name] = {
@ -832,12 +832,11 @@ def _get_full_output(node, for_output=False):
Returns a dictionary containing the full information of a node.
'''
ret = {}
name = node['name']
for item in six.iterkeys(node):
value = node[item]
if value is not None and for_output:
value = str(value)
ret[name][item] = value
ret[item] = value
return ret