[multiple] Move ansible_user_dir to group_vars [2/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]>

Author: amartyasinha

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

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"

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:

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:

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

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:

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:

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: >-
       {{

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"

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: >-
         {{