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

Py3 compatibility fixes

Browse Source
This commit is contained in:
Pedro Algarvio 2014-11-21 02:54:05 +00:00
parent d220178c47
commit 619b9e114f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/config.py
View File

@ -1427,7 +1427,7 @@ def apply_vm_profiles_config(providers, overrides, defaults=None):
vms[key] = val
# Is any VM profile extending data!?
for profile, details in vms.copy().items():
for profile, details in six.iteritems(vms.copy()):
if 'extends' not in details:
if ':' in details['provider']:
alias, driver = details['provider'].split(':')
@ -1696,7 +1696,7 @@ def apply_cloud_providers_config(overrides, defaults=None):
# Merge provided extends
keep_looping = False
for alias, entries in six.iteritems(providers.copy()):
for driver, details in entries.items():
for driver, details in six.iteritems(entries):
if 'extends' not in details:
# Extends resolved or non existing, continue!
@ -1852,8 +1852,8 @@ def is_provider_configured(opts, provider, required_keys=()):
# return it!
return opts['providers'][alias][driver]
for alias, drivers in opts['providers'].items():
for driver, provider_details in drivers.items():
for alias, drivers in six.iteritems(opts['providers']):
for driver, provider_details in six.iteritems(drivers):
if driver != provider:
continue