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

Merge pull request #22907 from techhat/cloudconfig

Browse Source 
Properly merge cloud configs to create profiles
This commit is contained in:
Nicole Thomas 2015-04-21 16:02:44 -06:00
commit 31c461f573
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
salt/cloud/__init__.py
View File

@ -30,6 +30,7 @@ import salt.client
import salt.loader
import salt.utils
import salt.utils.cloud
import salt.syspaths
from salt.utils import context
from salt._compat import string_types
@ -1280,12 +1281,19 @@ class Cloud(object):
ret = {}
if not vm_overrides:
vm_overrides = {}
with salt.utils.fopen(os.path.join(salt.syspaths.CONFIG_DIR, 'cloud'), 'r') as mcc:
main_cloud_config = yaml.safe_load(mcc)
profile_details = self.opts['profiles'][profile]
alias, driver = profile_details['provider'].split(':')
mapped_providers = self.map_providers_parallel()
alias_data = mapped_providers.setdefault(alias, {})
vms = alias_data.setdefault(driver, {})
provider_details = self.opts['providers'][alias][driver].copy()
del provider_details['profiles']
for name in names:
name_exists = False
if name in vms:
@ -1302,8 +1310,11 @@ class Cloud(object):
ret[name] = {'Error': msg}
continue
vm_ = profile_details.copy()
vm_ = main_cloud_config.copy()
vm_.update(provider_details)
vm_.update(profile_details)
vm_.update(vm_overrides)
vm_['name'] = name
if self.opts['parallel']:
process = multiprocessing.Process(