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

fix raet regression that is still on the 2015.2 branch

Browse Source
This commit is contained in:
Thomas S Hatch 2015-01-25 09:31:36 -07:00
parent 828906d62d
commit 658045ba20
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/config.py
View File

@ -2035,7 +2035,7 @@ def master_config(path, env_var='SALT_MASTER_CONFIG', defaults=None):
# out or not present.
if opts.get('nodegroups') is None:
opts['nodegroups'] = DEFAULT_MASTER_OPTS.get('nodegroups', {})
if opts.get('transport') == 'raet':
if opts.get('transport') == 'raet' and 'aes' in opts:
opts.pop('aes')
return opts