Skip to content

Move ansible_user_dir to group_vars [1/5] #3490

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
amartyasinha wants to merge 1 commit into from
Closed

Move ansible_user_dir to group_vars [1/5] #3490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion reproducer-clean.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
- deepscrub
delegate_to: localhost
ansible.builtin.file:
path: "{{ lookup('env', 'HOME') }}/ci-framework-data/ci-reproducer"
path: "{{ ansible_user_dir }}/ci-framework-data/ci-reproducer"
state: absent

- name: Remove basedir
Expand Down
2 changes: 1 addition & 1 deletion roles/ci_gen_kustomize_values/molecule/default/prepare.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
vars:
cifmw_ci_gen_kustomize_values_src_dir: >-
{{
(lookup('env', 'HOME'),
(ansible_user_dir,
'ci-framework-data',
'artifacts', 'ci_k8s_snippets') | path_join
}}
Expand Down
1 change: 0 additions & 1 deletion roles/cifmw_setup/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
---
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
openstack_namespace: openstack
1 change: 0 additions & 1 deletion roles/rhol_crc/molecule/add_crc_creds/converge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
hosts: all
gather_facts: true
vars:
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
tasks:
- name: Verify crc creds playbook
Expand Down
1 change: 0 additions & 1 deletion roles/rhol_crc/molecule/binary/cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
- name: Prepare
hosts: all
vars:
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
tasks:
- name: Cleanup RHOL/CRC after tests
Expand Down
1 change: 0 additions & 1 deletion roles/rhol_crc/molecule/default/cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
- name: Prepare
hosts: all
vars:
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
tasks:
- name: Cleanup CRC
Expand Down
1 change: 0 additions & 1 deletion roles/rhol_crc/molecule/default/converge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
hosts: all
gather_facts: true
vars:
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
cifmw_manage_secrets_pullsecret_content: >
{"auths":{"fake":{"auth": "Zm9vOmJhcgo="}}}
Expand Down
1 change: 0 additions & 1 deletion roles/rhol_crc/molecule/default/prepare.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
- name: Prepare
hosts: all
vars:
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
async_duration: 6000
tasks:
Expand Down
1 change: 0 additions & 1 deletion roles/rhol_crc/molecule/find_crc/cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
- name: Prepare
hosts: all
vars:
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
tasks:
- name: Cleanup RHOL/CRC after tests
Expand Down
1 change: 0 additions & 1 deletion roles/rhol_crc/molecule/get_versions/cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
- name: Prepare
hosts: all
vars:
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
tasks:
- name: Cleanup RHOL/CRC after tests
Expand Down
1 change: 0 additions & 1 deletion roles/rhol_crc/molecule/get_versions/converge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
hosts: all
gather_facts: true
vars:
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}"
tasks:
- name: Get CRC and openshift versions
Expand Down
Loading