valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17991 from nmadhok/cloud/clouds-python3-botocore_aws

Browse Source 
Making salt/cloud/clouds/botocore_aws python3 compatible
This commit is contained in:
Colton Myers 2014-11-12 14:33:15 -07:00
commit 2a36c2785e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/cloud/clouds/botocore_aws.py
View File

@ -28,6 +28,7 @@ If this driver is still needed, set up the cloud configuration at
provider: aws
'''
from __future__ import absolute_import
# pylint: disable=E0102
# Import python libs
@ -39,6 +40,7 @@ import logging
import salt.config as config
from salt.utils import namespaced_function
from salt.exceptions import SaltCloudException, SaltCloudSystemExit
import six
# Import libcloudfuncs and libcloud_aws, required to latter patch __opts__
try:
@ -84,7 +86,7 @@ def __virtual__():
if get_configured_provider() is False:
return False
for provider, details in __opts__['providers'].iteritems():
for provider, details in six.iteritems(__opts__['providers']):
if 'provider' not in details or details['provider'] != 'aws':
continue