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

Compare against client_env if that resolves

Browse Source
This commit is contained in:
Mike Place 2015-06-23 11:02:40 -06:00
parent 13d544b675
commit e77363dbf7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/state.py
View File

@ -2320,8 +2320,12 @@ class BaseHighState(object):
if 'file_roots' in self.opts:
envs.extend(list(self.opts['file_roots']))
client_envs = self.client.envs()
if self.opts.get('env_order', []):
return self.opts['env_order']
env_order = self.opts.get('env_order', [])
client_envs = self.client.envs()
if env_order and client_envs:
return set(env_order).intersection(self.client.envs())
elif env_order:
return env_order
else:
for cenv in client_envs:
if cenv not in envs: