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 #28231 from rallytime/fix-28227

Browse source 
Make sure we're compairing strings when getting images in the DO driver
This commit is contained in:
Mike Place 2015-10-23 07:49:37 -06:00
commit 570e7faa3b
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -34,7 +34,7 @@ import pprint
import logging
import decimal
# Import Salt Cloud Libs
# Import Salt Libs
import salt.utils.cloud
import salt.config as config
from salt.exceptions import (
@ -44,6 +44,7 @@ from salt.exceptions import (
SaltCloudExecutionFailure,
SaltCloudExecutionTimeout
)
from salt.ext.six import string_types
# Import Third Party Libs
try:
@ -207,6 +208,9 @@ def get_image(vm_):
vm_image = config.get_cloud_config_value(
'image', vm_, __opts__, search_global=False
)
if not isinstance(vm_image, string_types):
vm_image = str(vm_image)
for image in images:
if vm_image in (images[image]['name'], images[image]['slug'], images[image]['id']):
if images[image]['slug'] is not None: