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

lxc: Fix salt config (no more a kwarg)

Browse source 
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
This commit is contained in:
Mathieu Le Marec - Pasquet 2015-05-17 18:11:48 +02:00
parent 63e63fa527
commit fdb64245d4
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/lxc.py
View file

@ -1283,8 +1283,7 @@ def init(name,
seed = select('seed', True)
install = select('install', True)
seed_cmd = select('seed_cmd')
salt_config = _get_salt_config(
copy.deepcopy(select('config', {})), **kwargs)
salt_config = _get_salt_config(config, **kwargs)
approve_key = select('approve_key', True)
clone_from = select('clone_from')
if password and password_encrypted is None: