From 271f33fa6103e4179d03ff4de1212a0672595565 Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Mon, 3 Nov 2025 12:21:28 +0100 Subject: [PATCH] Move cifmw_basedir var to group_vars - part two 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 of a set of changes. Signed-off-by: Daniel Pawlik --- group_vars/all.yml | 1 + roles/ci_setup/defaults/main.yml | 2 +- roles/cifmw_cephadm/defaults/main.yml | 2 +- roles/cifmw_external_dns/defaults/main.yml | 2 +- roles/cifmw_setup/tasks/bootstrap.yml | 2 +- roles/cifmw_setup/tasks/run_logs.yml | 4 ++-- roles/compliance/defaults/main.yml | 2 +- roles/config_drive/defaults/main.yml | 5 +---- roles/copy_container/defaults/main.yml | 2 +- roles/dlrn_promote/defaults/main.yml | 2 +- roles/dlrn_report/defaults/main.yml | 2 +- roles/edpm_build_images/defaults/main.yml | 2 +- roles/edpm_deploy/defaults/main.yml | 2 +- roles/edpm_deploy_baremetal/defaults/main.yml | 2 +- roles/edpm_kustomize/defaults/main.yml | 2 +- roles/edpm_prepare/defaults/main.yml | 2 +- roles/env_op_images/defaults/main.yml | 2 +- roles/env_op_images/molecule/default/converge.yml | 2 +- roles/hci_prepare/defaults/main.yml | 2 +- roles/hive/defaults/main.yml | 2 +- roles/install_yamls/defaults/main.yml | 2 +- roles/install_yamls/tasks/main.yml | 4 ++-- 22 files changed, 24 insertions(+), 26 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index 3a84ffffbc..4add9afd8d 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -8,3 +8,4 @@ cifmw_project_dir_absolute: "{{ ansible_user_dir }}/{{ cifmw_project_dir }}" cifmw_installyamls_repos_relative: src/github.com/openstack-k8s-operators/install_yamls # since cifmw_installyamls_repos var already exists, let's use that and move all definition here in single place instead of creating another variable. cifmw_installyamls_repos: "{{ ansible_user_dir }}/{{ cifmw_installyamls_repos_relative }}" +cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data" diff --git a/roles/ci_setup/defaults/main.yml b/roles/ci_setup/defaults/main.yml index 7c3d21f24a..5122bbd22c 100644 --- a/roles/ci_setup/defaults/main.yml +++ b/roles/ci_setup/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_ci_setup" -cifmw_ci_setup_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_ci_setup_basedir: "{{ cifmw_basedir }}" cifmw_ci_setup_openshift_client_version: "stable" cifmw_ci_setup_oc_install_path: "{{ ansible_user_dir ~ '/bin' }}" cifmw_ci_setup_epel_pkgs: [] diff --git a/roles/cifmw_cephadm/defaults/main.yml b/roles/cifmw_cephadm/defaults/main.yml index 5e049aeca7..1cdc590368 100644 --- a/roles/cifmw_cephadm/defaults/main.yml +++ b/roles/cifmw_cephadm/defaults/main.yml @@ -1,6 +1,6 @@ --- # defaults file for cifmw_cephadm -cifmw_cephadm_basedir: "{{ cifmw_basedir | default( ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_cephadm_basedir: "{{ cifmw_basedir }}" cifmw_cephadm_spec_on_bootstrap: false # not recommended due to https://tracker.ceph.com/issues/49277 cifmw_cephadm_ssh_user: ceph-admin cifmw_cephadm_bin: /usr/sbin/cephadm diff --git a/roles/cifmw_external_dns/defaults/main.yml b/roles/cifmw_external_dns/defaults/main.yml index 25a40d8ca8..fd961117b6 100644 --- a/roles/cifmw_external_dns/defaults/main.yml +++ b/roles/cifmw_external_dns/defaults/main.yml @@ -23,7 +23,7 @@ cifmw_external_dns_check_mode: false cifmw_external_dns_certificate_dir: /etc/pki/tls/ cifmw_external_dns_certificate: "{{ cifmw_external_dns_certificate_dir ~ cifmw_external_dns_domain }}.crt" cifmw_external_dns_key: "{{ cifmw_external_dns_certificate_dir ~ cifmw_external_dns_domain }}.key" -cifmw_external_dns_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_external_dns_basedir: "{{ cifmw_basedir }}" cifmw_external_dns_manifests_dir: "{{ cifmw_manifests | default(cifmw_external_dns_basedir ~ '/artifacts/manifests') }}/cifmw_external_dns" # Important: use the same rootca-public as openstack cifmw_external_dns_cert_issuer_ref: diff --git a/roles/cifmw_setup/tasks/bootstrap.yml b/roles/cifmw_setup/tasks/bootstrap.yml index 0f92eb2b5e..87ac0cd4b7 100644 --- a/roles/cifmw_setup/tasks/bootstrap.yml +++ b/roles/cifmw_setup/tasks/bootstrap.yml @@ -63,5 +63,5 @@ - always ansible.builtin.copy: mode: "0644" - dest: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters/custom-params.yml" + dest: "{{ cifmw_basedir }}/artifacts/parameters/custom-params.yml" content: "{{ ci_framework_params | to_nice_yaml }}" diff --git a/roles/cifmw_setup/tasks/run_logs.yml b/roles/cifmw_setup/tasks/run_logs.yml index 895fc6a1de..0329d2daca 100644 --- a/roles/cifmw_setup/tasks/run_logs.yml +++ b/roles/cifmw_setup/tasks/run_logs.yml @@ -38,7 +38,7 @@ logfiles_dest_dir: >- {{ ( - cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data'), + cifmw_basedir, 'logs/', now(fmt='%Y-%m-%d_%H-%M') ) | path_join @@ -97,7 +97,7 @@ dest: >- {{ ( - cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data'), + cifmw_basedir, "artifacts/ansible_facts." + now(fmt='%Y-%m-%d_%H-%M') ) | path_join }} diff --git a/roles/compliance/defaults/main.yml b/roles/compliance/defaults/main.yml index 8cd30b1971..904b271ed6 100644 --- a/roles/compliance/defaults/main.yml +++ b/roles/compliance/defaults/main.yml @@ -17,7 +17,7 @@ # defaults file for compliance role -cifmw_compliance_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/tests/compliance" +cifmw_compliance_artifacts_basedir: "{{ cifmw_basedir }}/tests/compliance" cifmw_compliance_cleanup: true # A list of available profiles can be found using "oscap info /usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml" diff --git a/roles/config_drive/defaults/main.yml b/roles/config_drive/defaults/main.yml index 146f9f27df..869fd9bf7a 100644 --- a/roles/config_drive/defaults/main.yml +++ b/roles/config_drive/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_config_drive" -cifmw_config_drive_basedir: >- - {{ - cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') - }} +cifmw_config_drive_basedir: "{{ cifmw_basedir }}" cifmw_config_drive_workdir: >- {{ cifmw_config_drive_basedir }}/artifacts/cifmw_config_drive diff --git a/roles/copy_container/defaults/main.yml b/roles/copy_container/defaults/main.yml index 2d4e32fe16..fe008b77ad 100644 --- a/roles/copy_container/defaults/main.yml +++ b/roles/copy_container/defaults/main.yml @@ -6,4 +6,4 @@ enable_cron_c9: true # NEW names for conventions cifmw_copy_ct_enable_cron: "{{ enable_cron }}" cifmw_copy_ct_enable_cron_c9: "{{ enable_cron_c9 }}" -cifmw_copy_ct_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_copy_ct_basedir: "{{ cifmw_basedir }}" diff --git a/roles/dlrn_promote/defaults/main.yml b/roles/dlrn_promote/defaults/main.yml index 344466ee3c..a3006364c2 100644 --- a/roles/dlrn_promote/defaults/main.yml +++ b/roles/dlrn_promote/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_dlrn_report" -cifmw_dlrn_promote_workspace: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_dlrn_promote_workspace: "{{ cifmw_basedir }}" cifmw_dlrn_promote_dlrnapi_user: "{{ dlrnapi_user | default('review_rdoproject_org') }}" cifmw_dlrn_promote_kerberos_auth: false cifmw_dlrn_promote_dlrnapi_host_principal: "" diff --git a/roles/dlrn_report/defaults/main.yml b/roles/dlrn_report/defaults/main.yml index 2fb646d9f4..5f35fa9f1b 100644 --- a/roles/dlrn_report/defaults/main.yml +++ b/roles/dlrn_report/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_dlrn_report" -cifmw_dlrn_report_workspace: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_dlrn_report_workspace: "{{ cifmw_basedir }}" cifmw_dlrn_report_dlrnapi_user: "{{ dlrnapi_user | default('review_rdoproject_org') }}" cifmw_dlrn_report_kerberos_auth: false cifmw_dlrn_report_result: true diff --git a/roles/edpm_build_images/defaults/main.yml b/roles/edpm_build_images/defaults/main.yml index 1bd06be2fe..87d158c6f2 100644 --- a/roles/edpm_build_images/defaults/main.yml +++ b/roles/edpm_build_images/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_edpm_build_images" -cifmw_edpm_build_images_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_edpm_build_images_basedir: "{{ cifmw_basedir }}" cifmw_edpm_build_images_via_rpm: true cifmw_edpm_build_images_host_packages: - diskimage-builder diff --git a/roles/edpm_deploy/defaults/main.yml b/roles/edpm_deploy/defaults/main.yml index fb85daf66c..e42f6449a6 100644 --- a/roles/edpm_deploy/defaults/main.yml +++ b/roles/edpm_deploy/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_edpm_deploy" -cifmw_edpm_deploy_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_edpm_deploy_basedir: "{{ cifmw_basedir }}" cifmw_edpm_deploy_manifests_dir: "{{ cifmw_manifests | default(cifmw_edpm_deploy_basedir ~ '/artifacts/manifests') }}" cifmw_edpm_deploy_retries: 100 cifmw_edpm_deploy_run_validation: false diff --git a/roles/edpm_deploy_baremetal/defaults/main.yml b/roles/edpm_deploy_baremetal/defaults/main.yml index 58d519d999..dbe101c6ce 100644 --- a/roles/edpm_deploy_baremetal/defaults/main.yml +++ b/roles/edpm_deploy_baremetal/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_edpm_deploy_baremetal" -cifmw_edpm_deploy_baremetal_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_edpm_deploy_baremetal_basedir: "{{ cifmw_basedir }}" cifmw_edpm_deploy_baremetal_manifests_dir: "{{ cifmw_manifests | default(cifmw_edpm_deploy_baremetal_basedir ~ '/artifacts/manifests') }}" cifmw_edpm_deploy_baremetal_dry_run: false cifmw_edpm_deploy_baremetal_wait_provisionserver_retries: 60 diff --git a/roles/edpm_kustomize/defaults/main.yml b/roles/edpm_kustomize/defaults/main.yml index 96db513660..45480091c3 100644 --- a/roles/edpm_kustomize/defaults/main.yml +++ b/roles/edpm_kustomize/defaults/main.yml @@ -17,5 +17,5 @@ # All variables intended for modification should be placed in this file. # All variables within this role should have a prefix of "cifmw_edpm_kustomize" -cifmw_edpm_kustomize_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_edpm_kustomize_basedir: "{{ cifmw_basedir }}" cifmw_edpm_kustomize_artifacts_dir: "{{ cifmw_edpm_kustomize_basedir ~ '/artifacts' }}" diff --git a/roles/edpm_prepare/defaults/main.yml b/roles/edpm_prepare/defaults/main.yml index 9d4f6e2b49..83fd31c1e8 100644 --- a/roles/edpm_prepare/defaults/main.yml +++ b/roles/edpm_prepare/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_edpm_prepare" -cifmw_edpm_prepare_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_edpm_prepare_basedir: "{{ cifmw_basedir }}" cifmw_edpm_prepare_manifests_dir: "{{ cifmw_manifests | default(cifmw_edpm_prepare_basedir ~ '/artifacts/manifests') }}" cifmw_edpm_prepare_oc_retries: 30 cifmw_edpm_prepare_oc_delay: 30 diff --git a/roles/env_op_images/defaults/main.yml b/roles/env_op_images/defaults/main.yml index 1a6d053662..9cfa89074c 100644 --- a/roles/env_op_images/defaults/main.yml +++ b/roles/env_op_images/defaults/main.yml @@ -18,6 +18,6 @@ # All variables intended for modification should be placed in this file. # All variables within this role should have a prefix of "cifmw_env_op_images" -cifmw_env_op_images_dir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_env_op_images_dir: "{{ cifmw_basedir }}" cifmw_env_op_images_file: operator_images.yaml cifmw_env_op_images_dryrun: false diff --git a/roles/env_op_images/molecule/default/converge.yml b/roles/env_op_images/molecule/default/converge.yml index effc45a959..edb89515eb 100644 --- a/roles/env_op_images/molecule/default/converge.yml +++ b/roles/env_op_images/molecule/default/converge.yml @@ -20,7 +20,7 @@ vars: 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_env_op_images_dir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" + cifmw_env_op_images_dir: "{{ cifmw_basedir }}" cifmw_env_op_images_file: operator_images.yaml cifmw_env_op_images_dryrun: true cifmw_install_yamls_environment: diff --git a/roles/hci_prepare/defaults/main.yml b/roles/hci_prepare/defaults/main.yml index 7549fb849e..2b130fdc47 100644 --- a/roles/hci_prepare/defaults/main.yml +++ b/roles/hci_prepare/defaults/main.yml @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -cifmw_hci_prepare_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_hci_prepare_basedir: "{{ cifmw_basedir }}" cifmw_hci_prepare_dataplane_dir: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/dataplane" cifmw_hci_prepare_dryrun: false cifmw_hci_prepare_skip_load_parameters: false diff --git a/roles/hive/defaults/main.yml b/roles/hive/defaults/main.yml index 79cef2f05b..ca05c76d11 100644 --- a/roles/hive/defaults/main.yml +++ b/roles/hive/defaults/main.yml @@ -20,7 +20,7 @@ cifmw_hive_dry_run: false -cifmw_hive_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_hive_basedir: "{{ cifmw_basedir }}" cifmw_hive_artifacts_dir: "{{ cifmw_hive_basedir }}/artifacts/hive" cifmw_hive_oc_delete_timeout: 300 diff --git a/roles/install_yamls/defaults/main.yml b/roles/install_yamls/defaults/main.yml index 5a2b7e7b66..d7d77c07c1 100644 --- a/roles/install_yamls/defaults/main.yml +++ b/roles/install_yamls/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_install_yamls" cifmw_install_yamls_envfile: "install_yamls.sh" -cifmw_install_yamls_out_dir_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}" +cifmw_install_yamls_out_dir_basedir: "{{ cifmw_basedir }}" cifmw_install_yamls_out_dir: "{{ cifmw_install_yamls_out_dir_basedir }}/artifacts" cifmw_install_yamls_manifests_dir: "{{ cifmw_manifests | default(cifmw_install_yamls_out_dir_basedir ~ '/artifacts/manifests') }}" cifmw_install_yamls_edpm_dir: "{{ cifmw_manifests | default(cifmw_install_yamls_out_dir_basedir ~ '/artifacts/edpm') }}" diff --git a/roles/install_yamls/tasks/main.yml b/roles/install_yamls/tasks/main.yml index e78b1d9f6c..82946433d0 100644 --- a/roles/install_yamls/tasks/main.yml +++ b/roles/install_yamls/tasks/main.yml @@ -24,7 +24,7 @@ loop: - "{{ cifmw_install_yamls_out_dir }}" - "{{ cifmw_install_yamls_tasks_out }}" - - "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts/parameters" + - "{{ cifmw_basedir }}/artifacts/parameters" - name: Create variables with local repos based on Zuul items tags: @@ -159,7 +159,7 @@ tags: - bootstrap ansible.builtin.copy: - 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" content: >- {{ {