Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
ansible
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenEdx
ansible
Commits
0c5bbe3c
Commit
0c5bbe3c
authored
Sep 11, 2015
by
James Cammarata
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use the original (un-templated) args for include params
Fixes #12314
parent
5809a2e8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
lib/ansible/executor/task_executor.py
+2
-1
No files found.
lib/ansible/executor/task_executor.py
View file @
0c5bbe3c
...
...
@@ -272,6 +272,7 @@ class TaskExecutor:
if
self
.
_task
.
action
==
'debug'
and
'var'
in
self
.
_task
.
args
:
prev_var
=
self
.
_task
.
args
.
pop
(
'var'
)
original_args
=
self
.
_task
.
args
.
copy
()
self
.
_task
.
post_validate
(
templar
=
templar
)
if
'_variable_params'
in
self
.
_task
.
args
:
variable_params
=
self
.
_task
.
args
.
pop
(
'_variable_params'
)
...
...
@@ -286,7 +287,7 @@ class TaskExecutor:
# if this task is a TaskInclude, we just return now with a success code so the
# main thread can expand the task list for the given host
if
self
.
_task
.
action
==
'include'
:
include_variables
=
self
.
_task
.
args
.
copy
()
include_variables
=
original_args
include_file
=
include_variables
.
get
(
'_raw_params'
)
del
include_variables
[
'_raw_params'
]
return
dict
(
include
=
include_file
,
include_variables
=
include_variables
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment