cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Check for skipped tags in passed role variables before adding to them

Browse source 
Fixes #6330
This commit is contained in:
James Cammarata 2014-03-08 14:02:42 -06:00
parent c79b5ea4b4
commit 04a6dc6d12
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/playbook/play.py
View file

@ -227,6 +227,13 @@ class Play(object):
if meta_data:
allow_dupes = utils.boolean(meta_data.get('allow_duplicates',''))
if "tags" in passed_vars:
if not self._is_valid_tag(passed_vars["tags"]):
# one of the tags specified for this role was in the
# skip list, or we're limiting the tags and it didn't
# match one, so we just skip it completely
continue
# if any tags were specified as role/dep variables, merge
# them into the passed_vars so they're passed on to any
# further dependencies too, and so we only have one place
@ -268,13 +275,6 @@ class Play(object):
if 'role' in dep_vars:
del dep_vars['role']
if "tags" in passed_vars:
if not self._is_valid_tag(passed_vars["tags"]):
# one of the tags specified for this role was in the
# skip list, or we're limiting the tags and it didn't
# match one, so we just skip it completely
continue
if not allow_dupes:
if dep in self.included_roles:
# skip back to the top, since we don't want to