Restore Ansible 2.0 compatibility for includes

pull/15689/head
Martin Matuska 9 years ago
parent 1fc44e4103
commit 438ed70a43

@ -114,8 +114,7 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h
# 3. the included file name contains no variables, and has no loop # 3. the included file name contains no variables, and has no loop
is_static = t.static or \ is_static = t.static or \
C.DEFAULT_TASK_INCLUDES_STATIC or \ C.DEFAULT_TASK_INCLUDES_STATIC or \
(use_handlers and C.DEFAULT_HANDLER_INCLUDES_STATIC) or \ (use_handlers and C.DEFAULT_HANDLER_INCLUDES_STATIC)
not templar._contains_vars(t.args.get('_raw_params')) and t.loop is None
if is_static: if is_static:
if t.loop is not None: if t.loop is not None:

Loading…
Cancel
Save