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

update for problems with scaleway api

Browse source
This commit is contained in:
Robert Schmidt 2018-10-30 23:23:57 -04:00 • committed by Daniel Wozniak
parent 83e0c6e929
commit 1e31d7cd48
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
salt/cloud/clouds/scaleway.py
View file

@ -78,7 +78,7 @@ def avail_images(call=None):
"-f or --function, or with the --list-images option"
)
items = query(method="images")
items = query(method="images", root="marketplace_root")
ret = {}
for image in items["images"]:
ret[image["id"]] = {}
@ -371,13 +371,11 @@ def query(method="servers", server_id=None, command=None, args=None, http_method
"Error: '{1}'".format(request.status_code, request.text)
)
log.debug(request.url)
# success without data
if request.status_code == 204:
if request["status"] == 204:
return True
return request.json()
return salt.utils.json.loads(request["body"])
def script(server_):