Skip to content

Commit 430d188

Browse files
committed
[multiple] Move ansible_user_dir to group_vars [1/5]
This commit is one of the steps of replacing common used vars with group_vars to improve overall maintenance of variables in ci-framework Signed-off-by: Amartya Sinha <[email protected]>
1 parent 84c46b6 commit 430d188

File tree

11 files changed

+2
-11
lines changed

11 files changed

+2
-11
lines changed

reproducer-clean.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
- deepscrub
7373
delegate_to: localhost
7474
ansible.builtin.file:
75-
path: "{{ lookup('env', 'HOME') }}/ci-framework-data/ci-reproducer"
75+
path: "{{ ansible_user_dir }}/ci-framework-data/ci-reproducer"
7676
state: absent
7777

7878
- name: Remove basedir

roles/ci_gen_kustomize_values/molecule/default/prepare.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
vars:
2121
cifmw_ci_gen_kustomize_values_src_dir: >-
2222
{{
23-
(lookup('env', 'HOME'),
23+
(ansible_user_dir,
2424
'ci-framework-data',
2525
'artifacts', 'ci_k8s_snippets') | path_join
2626
}}
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
11
---
2-
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
32
openstack_namespace: openstack

roles/rhol_crc/molecule/add_crc_creds/converge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
hosts: all
1919
gather_facts: true
2020
vars:
21-
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
2221
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
2322
tasks:
2423
- name: Verify crc creds playbook

roles/rhol_crc/molecule/binary/cleanup.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
- name: Prepare
1919
hosts: all
2020
vars:
21-
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
2221
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
2322
tasks:
2423
- name: Cleanup RHOL/CRC after tests

roles/rhol_crc/molecule/default/cleanup.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
- name: Prepare
1919
hosts: all
2020
vars:
21-
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
2221
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
2322
tasks:
2423
- name: Cleanup CRC

roles/rhol_crc/molecule/default/converge.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
hosts: all
1919
gather_facts: true
2020
vars:
21-
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
2221
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
2322
cifmw_manage_secrets_pullsecret_content: >
2423
{"auths":{"fake":{"auth": "Zm9vOmJhcgo="}}}

roles/rhol_crc/molecule/default/prepare.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
- name: Prepare
1919
hosts: all
2020
vars:
21-
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
2221
cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
2322
async_duration: 6000
2423
tasks:

roles/rhol_crc/molecule/find_crc/cleanup.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
- name: Prepare
1919
hosts: all
2020
vars:
21-
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
2221
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
2322
tasks:
2423
- name: Cleanup RHOL/CRC after tests

roles/rhol_crc/molecule/get_versions/cleanup.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
- name: Prepare
1919
hosts: all
2020
vars:
21-
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
2221
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
2322
tasks:
2423
- name: Cleanup RHOL/CRC after tests

0 commit comments

Comments
 (0)