Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion create-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@

- name: Set permissions on ci-framework-data folder on controller-0
ansible.builtin.file:
path: "{{ cifmw_basedir | default(ansible_user_dir + '/ci-framework-data') }}"
path: "{{ cifmw_basedir }}"
state: directory
recurse: true
owner: "{{ ansible_user_id }}"
Expand Down
4 changes: 2 additions & 2 deletions group_vars/all.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
# This file contains all repeating variables, that can be set
# globaly instead of parse Zuul inventory file to get proper value.
# globally instead of parse Zuul inventory file to get proper value.
#### GLOBAL VARS ####
ansible_user_dir: "{{ lookup('env', 'HOME') }}"
cifmw_project_dir: src/github.com/openstack-k8s-operators/ci-framework
Expand All @@ -10,6 +10,6 @@ cifmw_installyamls_repos_relative: src/github.com/openstack-k8s-operators/instal
cifmw_installyamls_repos: "{{ ansible_user_dir }}/{{ cifmw_installyamls_repos_relative }}"
cifmw_architecture_repo_relative: src/github.com/openstack-k8s-operators/architecture
cifmw_architecture_repo: "{{ ansible_user_dir }}/{{ cifmw_architecture_repo_relative }}"

cifmw_openstack_namespace: "{{ cifmw_install_yamls_defaults['NAMESPACE'] | default('openstack') }}"
operator_namespace: "{{ cifmw_install_yamls_defaults['OPERATOR_NAMESPACE'] | default('openstack-operators') }}"
cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data"
2 changes: 1 addition & 1 deletion playbooks/01-bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,5 +71,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 }}"
4 changes: 2 additions & 2 deletions playbooks/99-logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,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
Expand Down Expand Up @@ -104,7 +104,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
}}
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/generate_make_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
until: "{{ make_%(target)s_until | default(true) }}"
register: "make_%(target)s_status"
cifmw.general.ci_script:
output_dir: "{{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts"
output_dir: "{{ cifmw_basedir }}/artifacts"
chdir: "%(chdir)s"
script: "make %(target)s"
dry_run: "{{ make_%(target)s_dryrun|default(false)|bool }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/artifacts/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_artifacts"
cifmw_artifacts_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
cifmw_artifacts_basedir: "{{ cifmw_basedir }}"
cifmw_artifacts_crc_host: "api.crc.testing"
cifmw_artifacts_crc_user: "core"
cifmw_artifacts_crc_sshkey: "~/.crc/machines/crc/id_ecdsa"
Expand Down
2 changes: 1 addition & 1 deletion roles/build_containers/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_build_containers"
cifmw_build_containers_tcib_src: "https://github.com/openstack-k8s-operators/tcib"
cifmw_build_containers_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
cifmw_build_containers_basedir: "{{ cifmw_basedir }}"
cifmw_build_containers_authfile_path: ${XDG_RUNTIME_DIR}/containers/auth.json
cifmw_build_containers_push_containers: false
cifmw_build_containers_timestamper_cmd: >-
Expand Down
2 changes: 0 additions & 2 deletions roles/build_containers/molecule/default/prepare.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

- name: Prepare
hosts: all
vars:
cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data/"
roles:
- role: test_deps
- role: repo_setup
2 changes: 1 addition & 1 deletion roles/build_openstack_packages/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ cifmw_bop_dlrn_deps:
- sqlite
- python3-libselinux

cifmw_bop_build_repo_dir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}/logs"
cifmw_bop_build_repo_dir: "{{ cifmw_basedir }}/logs"
cifmw_bop_artifacts_basedir: "{{ ansible_user_dir ~ '/ci-framework-data' }}"
cifmw_bop_dlrn_repo_url: "https://github.com/openstack-packages/DLRN.git"
cifmw_bop_dlrn_from_source: false
Expand Down
2 changes: 1 addition & 1 deletion roles/cert_manager/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_cert_manager"

cifmw_cert_manager_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
cifmw_cert_manager_basedir: "{{ cifmw_basedir }}"
cifmw_cert_manager_manifests_dir: "{{ cifmw_manifests | default(cifmw_cert_manager_basedir ~ '/artifacts/manifests') }}/cert-manager"
cifmw_cert_manager_operator_namespace: cert-manager-operator
cifmw_cert_manager_openshift_version: stable-v1
Expand Down
5 changes: 1 addition & 4 deletions roles/ci_gen_kustomize_values/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
# Top-level parameter shared with deploy_kustomize role
cifmw_architecture_scenario: null

cifmw_ci_gen_kustomize_values_basedir: >-
{{
cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data')
}}
cifmw_ci_gen_kustomize_values_basedir: "{{ cifmw_basedir }}"

cifmw_ci_gen_kustomize_values_architecture_repo: >-
{{
Expand Down
2 changes: 1 addition & 1 deletion roles/ci_local_storage/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_cls"

cifmw_cls_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
cifmw_cls_basedir: "{{ cifmw_basedir }}"
cifmw_cls_manifests_dir: "{{ cifmw_manifests | default(cifmw_cls_basedir ~ '/artifacts/manifests') }}/storage"
cifmw_cls_storage_class: local-storage
cifmw_cls_storage_capacity: 10Gi
Expand Down
2 changes: 1 addition & 1 deletion roles/ci_lvms_storage/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
cifmw_lvms_disk_list: []
cifmw_lvms_cluster_name: lvmcluster
cifmw_lvms_namespace: openshift-lvm-storage
cifmw_lvms_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
cifmw_lvms_basedir: "{{ cifmw_basedir }}"
cifmw_lvms_manifests_dir: "{{ cifmw_manifests | default(cifmw_lvms_basedir ~ '/artifacts/manifests') }}/lvms"
# The "lvms-" prefix is prepended to the cifmw_lvms_storage_class by the lvm-operator
cifmw_lvms_storage_class: local-storage
Expand Down
2 changes: 1 addition & 1 deletion roles/ci_multus/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_multus"

cifmw_ci_multus_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
cifmw_ci_multus_basedir: "{{ cifmw_basedir }}"
cifmw_ci_multus_manifests_dir: "{{ cifmw_manifests | default(cifmw_ci_multus_basedir ~ '/artifacts/manifests') }}/ci_multus"
cifmw_ci_multus_namespace: "openstack"
cifmw_ci_multus_ocp_hostname: "crc"
Expand Down
2 changes: 1 addition & 1 deletion roles/ci_nmstate/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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_ci_nmstate"
cifmw_ci_nmstate_basedir: "{{ cifmw_basedir | default(ansible_user_dir ~ '/ci-framework-data') }}"
cifmw_ci_nmstate_basedir: "{{ cifmw_basedir }}"
cifmw_ci_nmstate_manifests_dir: "{{ cifmw_manifests | default(cifmw_ci_nmstate_basedir ~ '/artifacts/manifests') }}/nmstate"
cifmw_ci_nmstate_configs_dir: "{{ cifmw_ci_nmstate_basedir }}/artifacts/nmstate"
cifmw_ci_nmstate_namespace: openshift-nmstate
Expand Down
2 changes: 1 addition & 1 deletion roles/ci_setup/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: []
2 changes: 1 addition & 1 deletion roles/cifmw_cephadm/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/cifmw_external_dns/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion roles/cifmw_setup/tasks/bootstrap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
4 changes: 2 additions & 2 deletions roles/cifmw_setup/tasks/run_logs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
}}
Expand Down
2 changes: 1 addition & 1 deletion roles/compliance/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 1 addition & 4 deletions roles/config_drive/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion roles/copy_container/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
2 changes: 1 addition & 1 deletion roles/dlrn_promote/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion roles/dlrn_report/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/edpm_build_images/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/edpm_deploy/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/edpm_deploy_baremetal/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/edpm_kustomize/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}"
2 changes: 1 addition & 1 deletion roles/edpm_prepare/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/env_op_images/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion roles/env_op_images/molecule/default/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion roles/hci_prepare/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/hive/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/install_yamls/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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') }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/install_yamls/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -166,7 +166,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: >-
{{
{
Expand Down
5 changes: 1 addition & 4 deletions roles/kustomize_deploy/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion roles/libvirt_manager/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions roles/manage_secrets/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"

Expand Down
2 changes: 1 addition & 1 deletion roles/mirror_registry/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Loading