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

add 'never' tag (#34104)

Browse source 
* add 'never' tag

skips a task unless a tag on the task is explicitly targeted

* never also affects untagged, clearer layout
This commit is contained in:
Brian Coca 2018-02-07 18:21:55 -05:00 committed by Matt Davis
parent 71f46d69d6
commit 6340d58cd1
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/playbook/taggable.py
View file

@ -50,8 +50,6 @@ class Taggable:
def evaluate_tags(self, only_tags, skip_tags, all_vars): def evaluate_tags(self, only_tags, skip_tags, all_vars):
''' this checks if the current item should be executed depending on tag options ''' ''' this checks if the current item should be executed depending on tag options '''
should_run = True
if self.tags: if self.tags:
templar = Templar(loader=self._loader, variables=all_vars) templar = Templar(loader=self._loader, variables=all_vars)
tags = templar.template(self.tags) tags = templar.template(self.tags)
@ -67,16 +65,19 @@ class Taggable:
# this makes isdisjoint work for untagged # this makes isdisjoint work for untagged
tags = self.untagged tags = self.untagged
should_run = True # default, tasks to run
if only_tags: if only_tags:
if 'always' in tags:
should_run = False should_run = True
elif ('all' in only_tags and 'never' not in tags):
if 'always' in tags or 'all' in only_tags:
should_run = True should_run = True
elif not tags.isdisjoint(only_tags): elif not tags.isdisjoint(only_tags):
should_run = True should_run = True
elif 'tagged' in only_tags and tags != self.untagged: elif 'tagged' in only_tags and tags != self.untagged and 'never' not in tags:
should_run = True should_run = True
else:
should_run = False
if should_run and skip_tags: if should_run and skip_tags: