Fix static determination for include_tasks

An incorrect removal of a conditional resulted in include_tasks falling
through to the old static detection mechanism incorrectly. This restores
the previous conditional check.

Fixes #31593
pull/31618/head
James Cammarata 7 years ago committed by Toshio Kuratomi
parent 0371d0deda
commit 3ef4f7e847

@ -133,8 +133,9 @@ def load_list_of_tasks(ds, play, block=None, role=None, task_include=None, use_h
# check to see if this include is dynamic or static: # check to see if this include is dynamic or static:
# 1. the user has set the 'static' option to false or 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
is_static = False if 'include_tasks' in task_ds:
if 'import_tasks' in task_ds: is_static = False
elif 'import_tasks' in task_ds:
is_static = True is_static = True
elif t.static is not None: elif t.static is not None:
display.deprecated("The use of 'static' has been deprecated. " display.deprecated("The use of 'static' has been deprecated. "

Loading…
Cancel
Save