diff --git a/roles/install_yamls/molecule/default/converge.yml b/roles/install_yamls/molecule/default/converge.yml index 1835746df9..361b157744 100644 --- a/roles/install_yamls/molecule/default/converge.yml +++ b/roles/install_yamls/molecule/default/converge.yml @@ -21,7 +21,6 @@ cifmw_install_yamls_vars: namespace: foobar openstack_ctlplane: controlplane-yaml-file.yaml - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_install_yamls_repo: "{{ cifmw_installyamls_repos }}" zuul: branch: main diff --git a/roles/libvirt_manager/defaults/main.yml b/roles/libvirt_manager/defaults/main.yml index 144a964937..ca299d84bc 100644 --- a/roles/libvirt_manager/defaults/main.yml +++ b/roles/libvirt_manager/defaults/main.yml @@ -46,7 +46,7 @@ cifmw_libvirt_manager_configuration: memory: "{{ cifmw_libvirt_manager_compute_memory }}" cpus: "{{ cifmw_libvirt_manager_compute_cpus }}" -cifmw_libvirt_manager_crc_pool: "{{ cifmw_crc_pool | default(lookup('env', 'HOME')) ~ '/.crc/machines/crc' }}" +cifmw_libvirt_manager_crc_pool: "{{ cifmw_crc_pool | default(ansible_user_dir ~ '/.crc/machines/crc') }}" cifmw_libvirt_manager_vol_prefix: '' cifmw_libvirt_manager_pool: cifmw_libvirt_manager_pool_dir: "{{ cifmw_libvirt_manager_basedir }}/volumes" diff --git a/roles/libvirt_manager/molecule/boot_order/converge.yml b/roles/libvirt_manager/molecule/boot_order/converge.yml index 4b3d7b3aab..1c3506e877 100644 --- a/roles/libvirt_manager/molecule/boot_order/converge.yml +++ b/roles/libvirt_manager/molecule/boot_order/converge.yml @@ -20,7 +20,6 @@ vars_files: - vars/net-def.yml vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_basedir: "/opt/basedir" cifmw_libvirt_manager_configuration: vms: diff --git a/roles/libvirt_manager/molecule/check_dns/converge.yml b/roles/libvirt_manager/molecule/check_dns/converge.yml index a35a9ee1c7..3298d1cf79 100644 --- a/roles/libvirt_manager/molecule/check_dns/converge.yml +++ b/roles/libvirt_manager/molecule/check_dns/converge.yml @@ -18,7 +18,6 @@ hosts: instance gather_facts: true vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_basedir: "/opt/basedir" _cifmw_libvirt_manager_layout: vms: diff --git a/roles/libvirt_manager/molecule/deploy_layout/converge.yml b/roles/libvirt_manager/molecule/deploy_layout/converge.yml index 77e3099fe5..0f67829929 100644 --- a/roles/libvirt_manager/molecule/deploy_layout/converge.yml +++ b/roles/libvirt_manager/molecule/deploy_layout/converge.yml @@ -18,7 +18,6 @@ hosts: instance gather_facts: true vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_basedir: "/opt/basedir" cifmw_libvirt_manager_vm_net_ip_set: compute: 100 diff --git a/roles/libvirt_manager/molecule/ocp_layout/converge.yml b/roles/libvirt_manager/molecule/ocp_layout/converge.yml index 549f3491e2..2d757ad9fe 100644 --- a/roles/libvirt_manager/molecule/ocp_layout/converge.yml +++ b/roles/libvirt_manager/molecule/ocp_layout/converge.yml @@ -19,7 +19,6 @@ gather_facts: true vars: cifmw_run_id: aabbcc11 - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_basedir: "/opt/basedir" _cifmw_libvirt_manager_layout: vms: diff --git a/roles/libvirt_manager/molecule/spine_leaf/converge.yml b/roles/libvirt_manager/molecule/spine_leaf/converge.yml index 9b3a79d15b..ad158e9b89 100644 --- a/roles/libvirt_manager/molecule/spine_leaf/converge.yml +++ b/roles/libvirt_manager/molecule/spine_leaf/converge.yml @@ -18,7 +18,6 @@ hosts: instance gather_facts: true vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_basedir: "/opt/basedir" cifmw_libvirt_manager_spineleaf_setup: true cifmw_libvirt_manager_network_interface_types: diff --git a/roles/libvirt_manager/molecule/spine_leaf/verify.yml b/roles/libvirt_manager/molecule/spine_leaf/verify.yml index c75516b0db..fce75f14fe 100644 --- a/roles/libvirt_manager/molecule/spine_leaf/verify.yml +++ b/roles/libvirt_manager/molecule/spine_leaf/verify.yml @@ -3,7 +3,6 @@ hosts: instance gather_facts: true vars: - ansible_user_dir: "{{ lookup('env', 'HOME') }}" cifmw_basedir: "/opt/basedir" compare_nets: >- {{ diff --git a/roles/libvirt_manager/tasks/clean_layout.yml b/roles/libvirt_manager/tasks/clean_layout.yml index 11d22bceff..dd609139e0 100644 --- a/roles/libvirt_manager/tasks/clean_layout.yml +++ b/roles/libvirt_manager/tasks/clean_layout.yml @@ -87,7 +87,7 @@ vars: vm: "{{ item | replace('cifmw-', '') }}" ansible.builtin.blockinfile: - path: "{{ lookup('env', 'HOME') }}/.ssh/config" + path: "{{ ansible_user_dir }}/.ssh/config" marker: "## {mark} {{ vm }} {{ inventory_hostname }}" state: absent create: true @@ -332,7 +332,7 @@ - name: Clean local ssh config vars: cifmw_ssh_jumper_target: 'localhost' - cifmw_ssh_jumper_config_dir: "{{ lookup('env', 'HOME') }}/.ssh" + cifmw_ssh_jumper_config_dir: "{{ ansible_user_dir }}/.ssh" ansible.builtin.include_role: name: "ssh_jumper" tasks_from: "cleanup.yml" diff --git a/roles/libvirt_manager/tasks/manage_vms.yml b/roles/libvirt_manager/tasks/manage_vms.yml index b41a943f05..9ffbb4c2cd 100644 --- a/roles/libvirt_manager/tasks/manage_vms.yml +++ b/roles/libvirt_manager/tasks/manage_vms.yml @@ -40,7 +40,7 @@ target: localhost proxy_host: "{{ ansible_host | default(inventory_hostname) }}" proxy_user: "{{ ansible_user | default(lookup('env', 'USER')) }}" - ssh_dir: "{{ lookup('env', 'HOME') }}/.ssh" + ssh_dir: "{{ ansible_user_dir }}/.ssh" ssh_ident: identity_file: >- {{ diff --git a/roles/openshift_provisioner_node/molecule/default/converge.yml b/roles/openshift_provisioner_node/molecule/default/converge.yml index 15ac7e03fe..9697682865 100644 --- a/roles/openshift_provisioner_node/molecule/default/converge.yml +++ b/roles/openshift_provisioner_node/molecule/default/converge.yml @@ -19,7 +19,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_opn_dry_run: true cifmw_use_opn: true diff --git a/roles/openshift_provisioner_node/molecule/default/prepare.yml b/roles/openshift_provisioner_node/molecule/default/prepare.yml index 29b0d54557..48d469f259 100644 --- a/roles/openshift_provisioner_node/molecule/default/prepare.yml +++ b/roles/openshift_provisioner_node/molecule/default/prepare.yml @@ -19,7 +19,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_basedir: "{{ ansible_user_dir }}/ci-framework-data" cifmw_use_libvirt_manager: true