Move ansible_user_dir to group_vars [5/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/adoption_osp_deploy/molecule/default/converge.yml

@@ -12,7 +12,6 @@
     cifmw_adoption_osp_deploy_repos: []
     cifmw_adoption_source_scenario_path: "."
     cifmw_basedir: "{{ playbook_dir }}"
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
 
   tasks:
     - name: Gather stack nodes and facts

roles/compliance/molecule/default/converge.yml

@@ -18,15 +18,13 @@
 - name: Converge test of controller tasks
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_compliance_dry_run: true
   roles:
     - role: "compliance"
 
 - name: Converge test of compute tasks
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_compliance_dry_run: true
   roles:
     - role: "compliance"

roles/nat64_appliance/molecule/default/cleanup.yml

@@ -1,7 +1,5 @@
 - name: Cleanup
   hosts: instance
-  vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
   tasks:
     - name: "Destroy the test-node"
       community.libvirt.virt:

roles/nat64_appliance/molecule/default/converge.yml

@@ -17,7 +17,6 @@
 - name: Converge
   hosts: instance
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
   tasks:
     - name: Crate SSH keypair

roles/nat64_appliance/molecule/default/prepare.yml

@@ -17,7 +17,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
   pre_tasks:
     - name: Create custom basedir

roles/shiftstack/molecule/default/cleanup.yml

@@ -17,7 +17,6 @@
 - name: Cleanup
   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 }}"
     cifmw_openshift_kubeconfig: "{{ ansible_user_dir  }}/.crc/machines/crc/kubeconfig"
     openstack_namespace_name: openstack

roles/shiftstack/molecule/default/converge.yml

@@ -18,7 +18,6 @@
 - name: Converge
   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 }}"
     cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig"
     cifmw_shiftstack_run_playbook: cifmw-gate.yaml

roles/shiftstack/molecule/default/prepare.yml

@@ -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 }}"
     cifmw_openshift_kubeconfig: "{{ ansible_user_dir  }}/.crc/machines/crc/kubeconfig"
     openstack_namespace_name: openstack

roles/tofu/molecule/default/prepare.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
     cifmw_install_yamls_tasks_out: "{{ ansible_user_dir }}/zuul-jobs/roles/install_yamls_makes/tasks"
     cifmw_install_yamls_defaults:

roles/update/molecule/default/converge.yml

@@ -18,9 +18,8 @@
 - name: Converge
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_update_run_dryrun: true
-    cifmw_openshift_kubeconfig: "{{ lookup('env', 'HOME') }}/.crc/machines/crc/kubeconfig"
+    cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig"
     cifmw_nolog: false
   tasks:
     - name: Initialize monitoring