valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Append empty dictionaries for saltenvs with no top file

Browse Source 
Rather than excluding them from the get_tops() return data at all, just
populate them with empty dictionaries. This makes it easier to unit test
things like merge order, while still being functionally the same as
exlcluding the saltenv from get_tops() altogether.
This commit is contained in:
Erik Johnson 2016-06-01 17:31:29 -05:00
parent 5eb1b3ca62
commit 9da40c4437
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/state.py
View File

@ -2407,6 +2407,8 @@ class BaseHighState(object):
saltenv=self.opts['environment'] saltenv=self.opts['environment']
) )
] ]
else:
tops[self.opts['environment']] = [{}]
elif self.opts['top_file_merging_strategy'] == 'merge': elif self.opts['top_file_merging_strategy'] == 'merge':
found = 0 found = 0
if self.opts.get('state_top_saltenv', False): if self.opts.get('state_top_saltenv', False):
@ -2426,6 +2428,7 @@ class BaseHighState(object):
) )
) )
else: else:
tops[saltenv].append({})
log.debug('No contents loaded for env: {0}'.format(saltenv)) log.debug('No contents loaded for env: {0}'.format(saltenv))
else: else:
for saltenv in self._get_envs(): for saltenv in self._get_envs():
@ -2444,6 +2447,7 @@ class BaseHighState(object):
) )
) )
else: else:
tops[saltenv].append({})
log.debug('No contents loaded for env: {0}'.format(saltenv)) log.debug('No contents loaded for env: {0}'.format(saltenv))
if found > 1: if found > 1:
log.warning('Top file merge strategy set to \'merge\' and multiple top files found. ' log.warning('Top file merge strategy set to \'merge\' and multiple top files found. '