wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixing a bug in role tag handling where only the first tag was used

Browse source 
Fixes #6517
This commit is contained in:
James Cammarata 2014-03-17 11:28:01 -05:00
parent ebb6b8442b
commit 7edee91aba
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -228,24 +228,28 @@ class Play(object):
if meta_data: if meta_data:
allow_dupes = utils.boolean(meta_data.get('allow_duplicates','')) 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 # if any tags were specified as role/dep variables, merge
# them into the passed_vars so they're passed on to any # them into the passed_vars so they're passed on to any
# further dependencies too, and so we only have one place # further dependencies too, and so we only have one place
# (passed_vars) to look for tags going forward # (passed_vars) to look for tags going forward
def __merge_tags(var_obj): def __merge_tags(var_obj):
old_tags = passed_vars.get('tags', []) old_tags = passed_vars.get('tags', [])
new_tags = var_obj.get('tags', []) if isinstance(var_obj, dict):
if isinstance(new_tags, basestring): new_tags = var_obj.get('tags', [])
new_tags = [new_tags, ] if isinstance(new_tags, basestring):
new_tags = [new_tags, ]
else:
new_tags = []
return list(set(old_tags).union(set(new_tags))) return list(set(old_tags).union(set(new_tags)))
if "tags" in passed_vars:
dep_tags = __merge_tags(dep)
if not self._is_valid_tag(dep_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
passed_vars['tags'] = __merge_tags(role_vars) passed_vars['tags'] = __merge_tags(role_vars)
passed_vars['tags'] = __merge_tags(dep_vars) passed_vars['tags'] = __merge_tags(dep_vars)