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

fixed skipped tags

Browse source
This commit is contained in:
Brian Coca 2015-02-08 23:06:34 -05:00
parent 95fa770ba0
commit 6579c5ddf5
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/ansible/playbook/__init__.py
View file

@ -736,7 +736,6 @@ class PlayBook(object):
continue continue
# only run the task if the requested tags match or has 'always' tag # only run the task if the requested tags match or has 'always' tag
should_run = False
if 'always' in task.tags: if 'always' in task.tags:
should_run = True should_run = True
else: else:
@ -745,26 +744,31 @@ class PlayBook(object):
if 'all' in self.only_tags: if 'all' in self.only_tags:
should_run = True should_run = True
elif 'tagged' in self.only_tags: else:
should_run = False
if 'tagged' in self.only_tags:
if task_set != u: if task_set != u:
should_run = True should_run = True
elif 'untagged' in self.only_tags: elif 'untagged' in self.only_tags:
if task_set == u: if task_set == u:
should_run = True should_run = True
else: else:
if len(set(task.tags).intersection(self.only_tags)) > 0: if len(task_set.intersection(self.only_tags)) > 0:
should_run = True should_run = True
# Check for tags that we need to skip # Check for tags that we need to skip
if 'tagged' in self.skip_tags: if 'all' in self.skip_tags:
if task_set == u:
should_run = False should_run = False
elif 'untagged' in self.only_tags: else:
if 'tagged' in self.skip_tags:
if task_set != u: if task_set != u:
should_run = False should_run = False
elif 'untagged' in self.skip_tags:
if task_set == u:
should_run = False
else: else:
if should_run: if should_run:
if len(set(task.tags).intersection(self.skip_tags)) > 0: if len(task_set.intersection(self.skip_tags)) > 0:
should_run = False should_run = False
if should_run: if should_run: