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 #24944 from techhat/issue24915

Browse source 
Double-check main_cloud_config
This commit is contained in:
C. R. Oldham 2015-06-25 06:29:55 -06:00
commit a11e4c6eea
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/cloud/__init__.py
View file

@ -1290,6 +1290,9 @@ class Cloud(object):
except IOError:
main_cloud_config = {}
if main_cloud_config is None:
main_cloud_config = {}
profile_details = self.opts['profiles'][profile]
alias, driver = profile_details['provider'].split(':')
mapped_providers = self.map_providers_parallel()