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 #26824 from pravka/fix-droplet-creation-from-snapshot-in-dov2

Browse source 
[salt-cloud] Fix creating droplet from snapshot in digital_ocean provider
This commit is contained in:
Joseph Hall 2015-09-01 23:18:37 -06:00
commit cdc0ea2fe3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -117,7 +117,7 @@ def avail_images(call=None):
for image in items['images']:
ret[image['id']] = {}
for item in image.keys():
ret[image['id']][item] = str(image[item])
ret[image['id']][item] = image[item]
page += 1
try:
@ -224,9 +224,9 @@ def get_image(vm_):
Return the image object to use
'''
images = avail_images()
vm_image = str(config.get_cloud_config_value(
vm_image = config.get_cloud_config_value(
'image', vm_, __opts__, search_global=False
))
)
for image in images:
if vm_image in (images[image]['name'], images[image]['slug'], images[image]['id']):
if images[image]['slug'] is not None: