Move cifmw_basedir var to group_vars - part three

The `cifmw_basedir` variable is now expected to be defined group_vars.
Previous fallback to `ansible_user_dir ~ '/ci-framework-data'` has been
removed from playbooks and roles.

This change ensures consistency across roles and prevents accidental use
of a default path when `cifmw_basedir` is intentionally unset.

This commit is one part of a set of changes.

Signed-off-by: Daniel Pawlik <[email protected]>

Author: danpawlik

roles/kustomize_deploy/defaults/main.yml

@@ -19,10 +19,7 @@
 
 # default resources
 
-cifmw_kustomize_deploy_basedir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_kustomize_deploy_basedir: "{{ cifmw_basedir }}"
 
 cifmw_kustomize_deploy_architecture_repo_url: "https://github.com/openstack-k8s-operators/architecture"
 

roles/libvirt_manager/defaults/main.yml

@@ -18,7 +18,7 @@
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_libvirt_manager"
 
-cifmw_libvirt_manager_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_libvirt_manager_basedir: "{{ cifmw_basedir }}"
 cifmw_libvirt_manager_enable_virtualization_module: false
 cifmw_libvirt_manager_user: "{{ ansible_user_id | default(lookup('env', 'USER')) }}"
 cifmw_libvirt_manager_images_url: https://cloud.centos.org/centos/9-stream/x86_64/images

roles/manage_secrets/defaults/main.yml

@@ -17,10 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_manage_secrets"
-cifmw_manage_secrets_basedir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_manage_secrets_basedir: "{{ cifmw_basedir }}"
 
 cifmw_manage_secrets_owner: "{{ ansible_user_id }}"
 

roles/mirror_registry/defaults/main.yml

@@ -21,4 +21,4 @@
 cifmw_mirror_registry_install_dir: /opt/mirror-registry
 cifmw_mirror_registry_fqdn: quay.openstack.lab
 cifmw_mirror_registry_release_version: v1.3.10
-cifmw_mirror_registry_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_mirror_registry_basedir: "{{ cifmw_basedir }}"

roles/nat64_appliance/defaults/main.yml

@@ -14,10 +14,7 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-cifmw_nat64_appliance_basedir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_nat64_appliance_basedir: "{{ cifmw_basedir }}"
 cifmw_nat64_appliance_workdir: "{{ cifmw_nat64_appliance_basedir }}/nat64_appliance"
 cifmw_nat64_appliance_venv_dir: "{{ cifmw_nat64_appliance_workdir }}/venv"
 

roles/networking_mapper/defaults/main.yml

@@ -17,10 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_networking_mapper"
-cifmw_networking_mapper_basedir: >-
-  {{
-    cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
-  }}
+cifmw_networking_mapper_basedir: "{{ cifmw_basedir }}"
 cifmw_networking_mapper_infra_dir: "/etc/ci/env"
 cifmw_networking_mapper_networking_def_path: >-
   {{ cifmw_networking_mapper_infra_dir }}/networking-definition.yml

roles/openshift_login/defaults/main.yml

@@ -17,7 +17,7 @@
 
 # All variables intended for modification should be placed in this file.
 # All variables within this role should have a prefix of "cifmw_openshift_login"
-cifmw_openshift_login_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_openshift_login_basedir: "{{ cifmw_basedir }}"
 cifmw_openshift_login_kubeconfig_default_path: "{{ cifmw_openshift_login_basedir ~ '/.kube/config' }}"
 
 cifmw_openshift_login_force_refresh: false

roles/openshift_login/tasks/main.yml

@@ -96,15 +96,15 @@
       cifmw_openshift_token: "{{ cifmw_openshift_token  }}"
       {% endif %}
   ansible.builtin.copy:
-    dest: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/openshift-login-params.yml"
+    dest: "{{ cifmw_basedir }}/artifacts/parameters/openshift-login-params.yml"
     content: "{{ cifmw_openshift_login_params_content | from_yaml | to_nice_yaml }}"
     mode: "0600"
 - name: Update the install-yamls-params with KUBECONFIG
   when: cifmw_install_yamls_environment is defined
   block:
     - name: Read the install yamls parameters file
       ansible.builtin.slurp:
-        path: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/install-yamls-params.yml"
+        path: "{{ cifmw_basedir }}/artifacts/parameters/install-yamls-params.yml"
       register: cifmw_openshift_login_install_yamls_artifacts_slurp
 
     - name: Append the KUBECONFIG to the install yamls parameters
@@ -119,5 +119,5 @@
                 }
               }, recursive=true) | to_nice_yaml
           }}
-        dest: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/install-yamls-params.yml"
+        dest: "{{ cifmw_basedir }}/artifacts/parameters/install-yamls-params.yml"
         mode: "0600"

roles/openshift_provisioner_node/defaults/main.yml

@@ -21,6 +21,6 @@
 cifmw_opn_external_bridge_name: "baremetal"
 cifmw_opn_prov_bridge_name: "provisioning"
 
-cifmw_opn_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}"
+cifmw_opn_basedir: "{{ cifmw_basedir }}"
 cifmw_opn_artifacts_dir: "{{ cifmw_opn_basedir }}/artifacts"
 cifmw_opn_dry_run: false

roles/openshift_provisioner_node/molecule/default/converge.yml

@@ -25,7 +25,7 @@
     cifmw_use_opn: true
     cifmw_opn_use_provisioning_network: false
     cifmw_opn_user: kni
-    cifmw_opn_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}"
+    cifmw_opn_basedir: "{{ cifmw_basedir }}"
 
   tasks:
     - name: Including the openshift provisioner node role.