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 #26165 from nmadhok/cloud-fix-26164

Browse Source 
clonefrom argument should be mandatory instead of image argument for vmware cloud driver.
This commit is contained in:
Nicole Thomas 2015-08-10 10:22:43 -06:00
commit d0ef023d72
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/__init__.py
View File

@ -2445,13 +2445,21 @@ def is_profile_configured(opts, provider, profile_name):
.. versionadded:: 2015.8.0
'''
# Standard dict keys required by all drivers.
required_keys = ['image', 'provider']
required_keys = ['provider']
alias, driver = provider.split(':')
# Most drivers need an image to be specified, but some do not.
non_image_drivers = ['vmware']
# Most drivers need a size, but some do not.
non_size_drivers = ['opennebula', 'parallels', 'scaleway', 'softlayer',
'softlayer_hw', 'vmware', 'vsphere']
if driver not in non_image_drivers:
required_keys.append('image')
elif driver == 'vmware':
required_keys.append('clonefrom')
if driver not in non_size_drivers:
required_keys.append('size')