Move ansible_user_dir to group_vars

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

hooks/playbooks/ceph.yml

@@ -30,8 +30,8 @@
   tasks:
     - name: Set ssh key path facts
       ansible.builtin.set_fact:
-        private_key: "{{ lookup('env', 'HOME') }}/.ssh/{{ cifmw_admin_user }}-id_rsa"
-        public_key: "{{ lookup('env', 'HOME') }}/.ssh/{{ cifmw_admin_user }}-id_rsa.pub"
+        private_key: "{{ ansible_user_dir }}/.ssh/{{ cifmw_admin_user }}-id_rsa"
+        public_key: "{{ ansible_user_dir }}/.ssh/{{ cifmw_admin_user }}-id_rsa.pub"
       run_once: true  # noqa: run-once[task]
 
     - name: Stat private key
@@ -80,14 +80,14 @@
 
     - name: Get local private key
       ansible.builtin.slurp:
-        src: "{{ lookup('env', 'HOME') }}/.ssh/{{ cifmw_admin_user }}-id_rsa"
+        src: "{{ ansible_user_dir }}/.ssh/{{ cifmw_admin_user }}-id_rsa"
       register: private_key_get
       delegate_to: localhost
       no_log: true
 
     - name: Get local public key
       ansible.builtin.slurp:
-        src: "{{ lookup('env', 'HOME') }}/.ssh/{{ cifmw_admin_user }}-id_rsa.pub"
+        src: "{{ ansible_user_dir }}/.ssh/{{ cifmw_admin_user }}-id_rsa.pub"
       register: public_key_get
       delegate_to: localhost
   roles:

reproducer-clean.yml

@@ -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

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/build_containers/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/"
   roles:
     - role: test_deps

roles/build_containers/molecule/hotfix/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/"
   roles:
     - role: test_deps

roles/build_openstack_packages/molecule/default/converge.yml

@@ -18,7 +18,6 @@
 - name: Converge
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ cifmw_project_dir_absolute  }}"
     cifmw_bop_openstack_release: master
     cifmw_bop_dlrn_baseurl: https://trunk.rdoproject.org/centos9-master

roles/build_openstack_packages/molecule/default/prepare.yml

@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_basedir: "{{ cifmw_project_dir_absolute }}"
   roles:
     - role: test_deps

roles/cert_manager/tasks/validate_certs.yml

@@ -16,7 +16,7 @@
 
 - name: Create $HOME/bin dir
   ansible.builtin.file:
-    path: "{{ lookup('env', 'HOME') }}/bin"
+    path: "{{ ansible_user_dir }}/bin"
     state: directory
     mode: '0755'
 
@@ -30,11 +30,11 @@
     _arch: "{{ lookup('pipe', 'go env GOARCH') }}"
   ansible.builtin.get_url:
     url: "https://github.com/cert-manager/cmctl/releases/{{ cifmw_cert_manager_version }}/download/cmctl_{{ _os }}_{{ _arch }}"
-    dest: "{{ lookup('env', 'HOME') }}/bin/cmctl"
+    dest: "{{ ansible_user_dir }}/bin/cmctl"
     mode: "0755"
 
 - name: Verify cert_manager api
   environment:
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
-  ansible.builtin.command: "{{ lookup('env', 'HOME') }}/bin/cmctl check api --wait=2m"
+  ansible.builtin.command: "{{ ansible_user_dir }}/bin/cmctl check api --wait=2m"

roles/ci_gen_kustomize_values/molecule/default/prepare.yml

@@ -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
       }}

roles/cifmw_setup/defaults/main.yml

@@ -1,3 +1,2 @@
 ---
-ansible_user_dir: "{{ lookup('env', 'HOME') }}"
 openstack_namespace: openstack