Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove limitations on validation types for eauth targets #31598

Merged
merged 1 commit into from
Mar 2, 2016
Merged

Remove limitations on validation types for eauth targets #31598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions salt/utils/minions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,14 +646,6 @@ def validate_tgt(self, valid, expr, expr_form):
'E': 'pcre',
'N': 'node',
None: 'glob'}
infinite = [
'node',
'ipcidr',
'pillar',
'pillar_pcre']
if not self.opts.get('minion_data_cache', False):
infinite.append('grain')
infinite.append('grain_pcre')

target_info = parse_target(valid)
if not target_info:
Expand All @@ -662,12 +654,6 @@ def validate_tgt(self, valid, expr, expr_form):
v_matcher = ref.get(target_info['engine'])
v_expr = target_info['pattern']

if v_matcher in infinite:
# We can't be sure what the subset is, only match the identical
# target
if v_matcher != expr_form:
return False
return v_expr == expr
v_minions = set(self.check_minions(v_expr, v_matcher))
minions = set(self.check_minions(expr, expr_form))
d_bool = not bool(minions.difference(v_minions))
Expand Down