Update TaskInclude _raw_params with the expanded/templated path to file (#39365)
* Update TaskInclude _raw_params with the expanded/templated path to file * Add tests to validate host vars include paths
This commit is contained in:
parent
2f5161628a
commit
4b01b92cfe
5 changed files with 24 additions and 0 deletions
|
@ -144,6 +144,8 @@ class IncludedFile:
|
|||
include_file = loader.path_dwim(include_result['include'])
|
||||
|
||||
include_file = templar.template(include_file)
|
||||
# Update the task args to reflect the expanded/templated path
|
||||
original_task.args['_raw_params'] = include_file
|
||||
inc_file = IncludedFile(include_file, include_variables, original_task)
|
||||
else:
|
||||
# template the included role's name here
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
- debug:
|
||||
msg: one
|
|
@ -0,0 +1,14 @@
|
|||
- hosts: testhost:testhost2
|
||||
tasks:
|
||||
- set_fact:
|
||||
include_me: one
|
||||
when: inventory_hostname == ansible_play_hosts[0]
|
||||
|
||||
- set_fact:
|
||||
include_me: two
|
||||
when: inventory_hostname == ansible_play_hosts[1]
|
||||
|
||||
- debug:
|
||||
var: include_me
|
||||
|
||||
- include_tasks: '{{ include_me }}/include_me.yml'
|
|
@ -0,0 +1,2 @@
|
|||
- debug:
|
||||
msg: two
|
|
@ -63,3 +63,7 @@ ANSIBLE_STRATEGY='linear' ansible-playbook test_grandparent_inheritance.yml -i .
|
|||
# undefined_var
|
||||
ANSIBLE_STRATEGY='linear' ansible-playbook undefined_var/playbook.yml -i ../../inventory "$@"
|
||||
ANSIBLE_STRATEGY='free' ansible-playbook undefined_var/playbook.yml -i ../../inventory "$@"
|
||||
|
||||
# Include path inheritance using host var for include file path
|
||||
ANSIBLE_STRATEGY='linear' ansible-playbook include_path_inheritance/playbook.yml -i ../../inventory "$@"
|
||||
ANSIBLE_STRATEGY='free' ansible-playbook include_path_inheritance/playbook.yml -i ../../inventory "$@"
|
||||
|
|
Loading…
Reference in a new issue