mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
parent
4b1600aae5
commit
98f6bc1f63
1 changed files with 42 additions and 5 deletions
|
@ -191,11 +191,17 @@ class Play(object):
|
|||
if meta_data:
|
||||
allow_dupes = utils.boolean(meta_data.get('allow_duplicates',''))
|
||||
|
||||
if not allow_dupes:
|
||||
if dep in self.included_roles:
|
||||
continue
|
||||
else:
|
||||
self.included_roles.append(dep)
|
||||
# if tags are set from this role, merge them
|
||||
# into the tags list for the dependent role
|
||||
if "tags" in passed_vars:
|
||||
for included_role_dep in dep_stack:
|
||||
included_dep_name = included_role_dep[0]
|
||||
included_dep_vars = included_role_dep[2]
|
||||
if included_dep_name == dep:
|
||||
if "tags" in included_dep_vars:
|
||||
included_dep_vars["tags"] = list(set(included_dep_vars["tags"] + passed_vars["tags"]))
|
||||
else:
|
||||
included_dep_vars["tags"] = passed_vars["tags"].copy()
|
||||
|
||||
dep_vars = utils.combine_vars(passed_vars, dep_vars)
|
||||
dep_vars = utils.combine_vars(role_vars, dep_vars)
|
||||
|
@ -211,8 +217,25 @@ class Play(object):
|
|||
dep_defaults_data = utils.parse_yaml_from_file(defaults)
|
||||
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
|
||||
# do anything else with this role
|
||||
continue
|
||||
else:
|
||||
self.included_roles.append(dep)
|
||||
|
||||
self._build_role_dependencies([dep], dep_stack, passed_vars=dep_vars, level=level+1)
|
||||
dep_stack.append([dep,dep_path,dep_vars,dep_defaults_data])
|
||||
|
||||
# only add the current role when we're at the top level,
|
||||
# otherwise we'll end up in a recursive loop
|
||||
if level == 0:
|
||||
|
@ -467,6 +490,20 @@ class Play(object):
|
|||
|
||||
# *************************************************
|
||||
|
||||
def _is_valid_tag(self, tag_list):
|
||||
"""
|
||||
Check to see if the list of tags passed in is in the list of tags
|
||||
we only want (playbook.only_tags), or if it is not in the list of
|
||||
tags we don't want (playbook.skip_tags).
|
||||
"""
|
||||
matched_skip_tags = set(tag_list) & set(self.playbook.skip_tags)
|
||||
matched_only_tags = set(tag_list) & set(self.playbook.only_tags)
|
||||
if len(matched_skip_tags) > 0 or (self.playbook.only_tags != ['all'] and len(matched_only_tags) == 0):
|
||||
return False
|
||||
return True
|
||||
|
||||
# *************************************************
|
||||
|
||||
def tasks(self):
|
||||
''' return task objects for this play '''
|
||||
return self._tasks
|
||||
|
|
Loading…
Reference in a new issue