Skip to content

Commit 94fa1e5

Browse files
committed
Replace var_dir and var_file tasks with include_dir and include_var
Some of the variables files sometimes contains jinja2 template vars, so on set fact they are not "translated". Signed-off-by: Daniel Pawlik <[email protected]>
1 parent afe8f95 commit 94fa1e5

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

ci/playbooks/e2e-collect-logs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222

2323
- name: Read base centos-9 scenarios
2424
vars:
25-
provided_file: >
25+
included_file: >
2626
{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/
2727
ci-framework/scenarios/centos-9/base.yml
2828
ansible.builtin.include_role:
2929
name: cifmw_helpers
30-
tasks_from: var_file.yml
30+
tasks_from: include_file.yml
3131

3232
- name: Run log collection
3333
ansible.builtin.import_role:

ci/playbooks/read_global_vars.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
tasks:
55
- name: Read group_vars all file
66
vars:
7-
provided_file: "{{ playbook_dir }}/group_vars/all.yml"
7+
included_file: "{{ playbook_dir }}/group_vars/all.yml"
88
ansible.builtin.include_role:
99
name: cifmw_helpers
10-
tasks_from: var_file.yml
10+
tasks_from: include_file.yml

roles/cifmw_setup/tasks/run_logs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
# Ensure, that the directory exists on localhost before continue.
1515
- name: Read artifacts parameters dir and set as facts
1616
vars:
17-
provided_dir: "{{ cifmw_basedir }}/artifacts/parameters"
17+
included_dir: "{{ cifmw_basedir }}/artifacts/parameters"
1818
ansible.builtin.include_role:
1919
name: cifmw_helpers
20-
tasks_from: var_dir.yml
20+
tasks_from: include_dir.yml
2121
always:
2222
- name: Set custom cifmw PATH reusable fact
2323
when:

0 commit comments

Comments
 (0)