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

format the profiles like salt-cloud is expecting them

Browse Source 
inside the provider.
This commit is contained in:
Daniel Wallace 2014-05-20 18:31:33 -05:00
parent 19e791f31d
commit 1e62d0f9bf
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/cloud/__init__.py
View File

@ -5,7 +5,7 @@ correct cloud modules
'''
# Import python libs
from __future__ import print_function
from __future__ import print_function, generators
import copy
import os
import traceback
@ -179,8 +179,9 @@ class CloudClient(object):
if pillars:
self.opts['profiles'].update(pillars.pop('profiles', {}))
self.opts['providers'].update(pillars.pop('providers', {}))
slef.opts.update(pillars)
for name, provider in pillars.pop('providers', {}).items():
self.opts['providers'].update({name: {provider['provider']: provider}})
self.opts.update(pillars)
def _opts_defaults(self, **kwargs):
'''