Merge pull request #38296 from nevins-b/issue-38239

Issue 38239
2024-11-06 16:45:27 +00:00 · 2016-12-20 07:08:03 -07:00 · 2016-12-20 07:08:03 -07:00 · 2416304c88
commit 2416304c88
parent 9cd7b72442 7355e68928
1 changed files with 7 additions and 0 deletions
--- a/salt/state.py
+++ b/salt/state.py
@ -2994,6 +2994,13 @@ class BaseHighState(object):
                                    _filter_matches(match, data, _opts)
                            if isinstance(item, six.string_types):
                                matches[saltenv].append(item)
+                            elif isinstance(item, dict):
+                                env_key, inc_sls = item.popitem()
+                                if env_key not in self.avail:
+                                    continue
+                                if env_key not in matches:
+                                    matches[env_key] = []
+                                matches[env_key].append(inc_sls)
                _filter_matches(match, data, self.opts['nodegroups'])
        ext_matches = self._ext_nodes()
        for saltenv in ext_matches: