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

Merge pull request #25278 from rallytime/fix-25228

Browse Source 
Don't require size for all cloud drivers when checking profile configs
This commit is contained in:
Joseph Hall 2015-07-08 20:52:23 -06:00
commit e078a6d924
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/config.py
View File

@ -2390,8 +2390,16 @@ def is_profile_configured(opts, provider, profile_name):
.. versionadded:: Beryllium
'''
required_keys = ['image', 'provider', 'size']
# Standard dict keys required by all drivers.
required_keys = ['image', 'provider']
alias, driver = provider.split(':')
# Most drivers need a size, but some do not.
non_size_drivers = ['parallels', 'softlayer', 'softlayer_hw']
if driver not in non_size_drivers:
required_keys.append('size')
provider_key = opts['providers'][alias][driver]
profile_key = opts['providers'][alias][driver]['profiles'][profile_name]