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

fix forward port of #46751

Browse source 
self.opts key 'environment' have been renamed to 'saltenv' after 2017.7,
thus the forward port broke the 'same' merging strategy again.
This commit is contained in:
Tamas Pal 2018-04-27 11:32:05 +02:00 • committed by rallytime
parent 9fbdcbe994
commit 3df6fa7990
No known key found for this signature in database
GPG key ID: E8F1A4B90D0DEA19
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/state.py
View file

@ -2999,7 +2999,7 @@ class BaseHighState(object):
'top_file_merging_strategy set to \'same\', but no '
'default_top configuration option was set'
)
self.opts['environment'] = self.opts['default_top']
self.opts['saltenv'] = self.opts['default_top']
if self.opts['saltenv']:
contents = self.client.cache_file(