Move ansible_user_dir to group_vars [4/5]

amartyasinha · amartyasinha · commit 534617ab0ae4 · 2025-11-18T12:28:02.000+05:30
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 &lt;amsinha@redhat.com&gt;
diff --git a/roles/edpm_deploy/molecule/default/converge.yml b/roles/edpm_deploy/molecule/default/converge.yml
@@ -18,7 +18,6 @@
 - name: Converge
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_edpm_deploy_dryrun: true
   roles:
     - role: "edpm_deploy"
diff --git a/roles/edpm_deploy/molecule/default/prepare.yml b/roles/edpm_deploy/molecule/default/prepare.yml
@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_install_yamls_tasks_out: "{{ ansible_user_dir }}/zuul-jobs/roles/install_yamls_makes/tasks"
     cifmw_install_yamls_defaults:
       NAMESPACE: openstack
diff --git a/roles/edpm_deploy_baremetal/molecule/default/prepare.yml b/roles/edpm_deploy_baremetal/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"
   roles:
diff --git a/roles/edpm_prepare/molecule/default/prepare.yml b/roles/edpm_prepare/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:
diff --git a/roles/install_ca/molecule/default/converge.yml b/roles/install_ca/molecule/default/converge.yml
@@ -17,8 +17,6 @@
 
 - name: Converge
   hosts: all
-  vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
   tasks:
     - name: Run role without any CA
       ansible.builtin.include_role:
diff --git a/roles/install_ca/molecule/default/prepare.yml b/roles/install_ca/molecule/default/prepare.yml
@@ -18,7 +18,6 @@
 - name: Prepare
   hosts: all
   vars:
-    ansible_user_dir: "{{ lookup('env', 'HOME') }}"
     cifmw_install_yamls_defaults:
       NAMESPACE: openstack
   roles:
diff --git a/scenarios/centos-9/ci.yml b/scenarios/centos-9/ci.yml
@@ -1,6 +1,4 @@
 ---
-ansible_user_dir: "{{ lookup('env', 'HOME') }}"
-
 cifmw_openshift_user: "kubeadmin"
 cifmw_openshift_password: "123456789"
 cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig"
diff --git a/scenarios/centos-9/content_provider.yml b/scenarios/centos-9/content_provider.yml
@@ -1,5 +1,4 @@
 ---
-ansible_user_dir: "{{ lookup('env', 'HOME') }}"
 cifmw_operator_build_push_registry: "{{ cifmw_rp_registry_ip | default('localhost') }}:5001"
 cifmw_operator_build_push_org: "openstack-k8s-operators"
 cifmw_operator_build_org: "openstack-k8s-operators"
diff --git a/scenarios/centos-9/edpm_baremetal_deployment_ci.yml b/scenarios/centos-9/edpm_baremetal_deployment_ci.yml
@@ -1,5 +1,4 @@
 ---
-ansible_user_dir: "{{ lookup('env', 'HOME') }}"
 cifmw_install_yamls_vars:
   DEPLOY_DIR: "{{ cifmw_basedir }}/artifacts/edpm_compute" # used during Baremetal deployment
   BMAAS_INSTANCE_MEMORY: 8192
diff --git a/scenarios/centos-9/edpm_build_images_content_provider.yml b/scenarios/centos-9/edpm_build_images_content_provider.yml
@@ -1,3 +1,2 @@
 ---
-ansible_user_dir: "{{ lookup('env', 'HOME') }}"
 cifmw_edmp_build_images_push_registry: "{{ cifmw_rp_registry_ip | default('localhost') }}:5001"
diff --git a/scenarios/centos-9/edpm_ci.yml b/scenarios/centos-9/edpm_ci.yml
@@ -1,5 +1,4 @@
 ---
-ansible_user_dir: "{{ lookup('env', 'HOME') }}"
 cifmw_install_yamls_vars:
   BMO_SETUP: false
   INSTALL_CERT_MANAGER: false
diff --git a/scenarios/centos-9/meta_content_provider.yml b/scenarios/centos-9/meta_content_provider.yml
@@ -1,6 +1,4 @@
 ---
-ansible_user_dir: "{{ lookup('env', 'HOME') }}"
-
 # build_operators vars
 cifmw_operator_build_push_registry: "{{ cifmw_rp_registry_ip }}:{{ cifmw_rp_registry_port }}"
 cifmw_operator_build_push_org: "openstack-k8s-operators"
diff --git a/scenarios/centos-9/podified_common.yml b/scenarios/centos-9/podified_common.yml
@@ -1,8 +1,6 @@
 ---
 # It is the common scenario file for EDPM multinode podified deployment
 
-ansible_user_dir: "{{ lookup('env', 'HOME') }}"
-
 cifmw_openshift_user: "kubeadmin"
 cifmw_openshift_password: "123456789"
 cifmw_openshift_kubeconfig: "{{ ansible_user_dir }}/.crc/machines/crc/kubeconfig"
diff --git a/scenarios/centos-9/tcib.yml b/scenarios/centos-9/tcib.yml
@@ -1,5 +1,4 @@
 ---
-ansible_user_dir: "{{ lookup('env', 'HOME') }}"
 cifmw_build_containers_tcib_src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/tcib"
 cifmw_repo_setup_src: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/repo-setup"
 cifmw_build_containers_repo_dir: "{{ cifmw_basedir }}/artifacts/repositories"

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`---`
`2`		`-ansible_user_dir: "{{ lookup('env', 'HOME') }}"`
`3`	`2`	`cifmw_operator_build_push_registry: "{{ cifmw_rp_registry_ip \| default('localhost') }}:5001"`
`4`	`3`	`cifmw_operator_build_push_org: "openstack-k8s-operators"`
`5`	`4`	`cifmw_operator_build_org: "openstack-k8s-operators"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`---`
`2`		`-ansible_user_dir: "{{ lookup('env', 'HOME') }}"`
`3`	`2`	`cifmw_edmp_build_images_push_registry: "{{ cifmw_rp_registry_ip \| default('localhost') }}:5001"`