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

Merge pull request #15689 from axelspringer/include_fix

Browse source 
Restore Ansible 2.0 compatibility for include:
This commit is contained in:
James Cammarata 2016-05-03 09:18:13 -04:00
commit c6a9d20b5c
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -108,14 +108,14 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h
all_vars = variable_manager.get_vars(loader=loader, play=play, task=t) all_vars = variable_manager.get_vars(loader=loader, play=play, task=t)
templar = Templar(loader=loader, variables=all_vars) templar = Templar(loader=loader, variables=all_vars)
# check to see if this include is static, which can be true if: # check to see if this include is dynamic or static:
# 1. the user set the 'static' option to true # 1. the user has set the 'static' option to false or true
# 2. one of the appropriate config options was set # 2. one of the appropriate config options was set
# 3. the included file name contains no variables, and has no loop if t.static is not None:
is_static = t.static or \ is_static = t.static
C.DEFAULT_TASK_INCLUDES_STATIC or \ else:
(use_handlers and C.DEFAULT_HANDLER_INCLUDES_STATIC) or \ is_static = C.DEFAULT_TASK_INCLUDES_STATIC or \
not templar._contains_vars(t.args.get('_raw_params')) and t.loop is None (use_handlers and C.DEFAULT_HANDLER_INCLUDES_STATIC)
if is_static: if is_static:
if t.loop is not None: if t.loop is not None:

2
lib/ansible/playbook/task_include.py
View file

@ -41,7 +41,7 @@ class TaskInclude(Task):
# ================================================================================= # =================================================================================
# ATTRIBUTES # ATTRIBUTES
_static = FieldAttribute(isa='bool', default=False) _static = FieldAttribute(isa='bool', default=None)
@staticmethod @staticmethod
def load(data, block=None, role=None, task_include=None, variable_manager=None, loader=None): def load(data, block=None, role=None, task_include=None, variable_manager=None, loader=None):