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

Fix conditional inheritance on dynamic includes (tasks and roles) (#30178)

Browse source 
Per the new style of execution, for dynamic tasks conditionals are expected
to only affect the include task itself and should not be inherited by child
tasks. This patch brings the behavior inline with this expectation.

Fixes #27845
This commit is contained in:
James Cammarata 2017-09-13 11:33:43 -05:00 committed by GitHub
parent b2ac60cfd7
commit b38f746604
3 changed files with 32 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/playbook/block.py
View file

@ -294,11 +294,12 @@ class Block(Base, Become, Conditional, Taggable):
if self._parent and (value is None or extend): if self._parent and (value is None or extend):
try: try:
parent_value = getattr(self._parent, attr, None) if attr != 'when' or getattr(self._parent, 'statically_loaded', True):
if extend: parent_value = getattr(self._parent, attr, None)
value = self._extend_value(value, parent_value, prepend) if extend:
else: value = self._extend_value(value, parent_value, prepend)
value = parent_value else:
value = parent_value
except AttributeError: except AttributeError:
pass pass
if self._role and (value is None or extend): if self._role and (value is None or extend):
@ -386,3 +387,11 @@ class Block(Base, Become, Conditional, Taggable):
return self._parent.all_parents_static() return self._parent.all_parents_static()
return True return True
def get_first_parent_include(self):
from ansible.playbook.task_include import TaskInclude
if self._parent:
if isinstance(self._parent, TaskInclude):
return self._parent
return self._parent.get_first_parent_include()
return None

4
lib/ansible/playbook/helpers.py
View file

@ -279,6 +279,7 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h
else: else:
task_list.extend(included_blocks) task_list.extend(included_blocks)
else: else:
t.is_static = False
task_list.append(t) task_list.append(t)
elif 'include_role' in task_ds or 'import_role' in task_ds: elif 'include_role' in task_ds or 'import_role' in task_ds:
@ -319,6 +320,9 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h
display.debug('Determined that if include_role static is %s' % str(is_static)) display.debug('Determined that if include_role static is %s' % str(is_static))
if is_static: if is_static:
# we set a flag to indicate this include was static
ir.statically_loaded = True
# uses compiled list from object # uses compiled list from object
blocks, _ = ir.get_block_list(variable_manager=variable_manager, loader=loader) blocks, _ = ir.get_block_list(variable_manager=variable_manager, loader=loader)
t = task_list.extend(blocks) t = task_list.extend(blocks)

19
lib/ansible/playbook/task.py
View file

@ -411,11 +411,12 @@ class Task(Base, Conditional, Taggable, Become):
try: try:
value = self._attributes[attr] value = self._attributes[attr]
if self._parent and (value is None or extend): if self._parent and (value is None or extend):
parent_value = getattr(self._parent, attr, None) if attr != 'when' or getattr(self._parent, 'statically_loaded', True):
if extend: parent_value = getattr(self._parent, attr, None)
value = self._extend_value(value, parent_value, prepend) if extend:
else: value = self._extend_value(value, parent_value, prepend)
value = parent_value else:
value = parent_value
except KeyError: except KeyError:
pass pass
@ -456,3 +457,11 @@ class Task(Base, Conditional, Taggable, Become):
if self._parent: if self._parent:
return self._parent.all_parents_static() return self._parent.all_parents_static()
return True return True
def get_first_parent_include(self):
from ansible.playbook.task_include import TaskInclude
if self._parent:
if isinstance(self._parent, TaskInclude):
return self._parent
return self._parent.get_first_parent_include()
return None