Skip to content

Commit

Permalink
Revert "Fix saltstack#22063: pillar wildcard support include"
Browse files Browse the repository at this point in the history
This reverts commit fbab73a.
  • Loading branch information
dwoz committed Apr 10, 2019
1 parent 791b646 commit 7745242
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions salt/pillar/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -763,25 +763,13 @@ def render_pstate(self, sls, saltenv, mods, defaults=None):
else:
# render included state(s)
include_states = []

matched_pstates = []
for sub_sls in state.pop('include'):
if isinstance(sub_sls, dict):
sub_sls, v = next(six.iteritems(sub_sls))
defaults = v.get('defaults', {})
key = v.get('key', None)
else:
key = None

try:
matched_pstates += fnmatch.filter(self.avail[saltenv], sub_sls)
except KeyError:
errors.extend(
['No matching pillar environment for environment '
'\'{0}\' found'.format(saltenv)]
)

for sub_sls in set(matched_pstates):
if sub_sls not in mods:
nstate, mods, err = self.render_pstate(
sub_sls,
Expand Down

0 comments on commit 7745242

Please sign in to comment.