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

Merge pull request #38501 from mvdwalle/fix-gogrid-list-password

Browse source 
Do not assume every object is a server
This commit is contained in:
Mike Place 2017-01-01 10:37:57 -07:00 • committed by GitHub
commit 13f0b809df
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/cloud/clouds/gogrid.py
View file

@ -326,10 +326,11 @@ def list_passwords(kwargs=None, call=None):
ret = {}
for item in response['list']:
server = item['server']['name']
if server not in ret:
ret[server] = []
ret[server].append(item)
if 'server' in item:
server = item['server']['name']
if server not in ret:
ret[server] = []
ret[server].append(item)
return ret