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 #23960 from rallytime/bp-22114

Browse source 
Backport #22114 to 2015.5
This commit is contained in:
Justin Findlay 2015-05-19 22:37:09 -06:00
commit 00c5c22867
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
salt/cloud/clouds/digital_ocean_v2.py
View file

@ -120,7 +120,10 @@ def avail_images(call=None):
ret[image['id']][item] = str(image[item])
page += 1
fetch = 'next' in items['links']['pages']
try:
fetch = 'next' in items['links']['pages']
except KeyError:
fetch = False
return ret
@ -169,7 +172,11 @@ def list_nodes(call=None):
'state': str(node['status']),
}
page += 1
fetch = 'next' in items['links']['pages']
try:
fetch = 'next' in items['links']['pages']
except KeyError:
fetch = False
return ret
@ -196,7 +203,10 @@ def list_nodes_full(call=None, forOutput=True):
value = str(value)
ret[node['name']][item] = value
page += 1
fetch = 'next' in items['links']['pages']
try:
fetch = 'next' in items['links']['pages']
except KeyError:
fetch = False
return ret
@ -583,7 +593,7 @@ def query(method='droplets', droplet_id=None, command=None, args=None, http_meth
'An error occurred while querying DigitalOcean. HTTP Code: {0} '
'Error: {1!r}'.format(
request.status_code,
#request.read()
# request.read()
request.text
)
)