From a6220d0ad3db17ee5bb575d8bf060f7c69583984 Mon Sep 17 00:00:00 2001 From: Brian Date: Wed, 28 Jan 2026 14:57:38 +0000 Subject: [PATCH] [multiple] Group-Vars: Create the cifmw_manifests_dir group var - Create the cifmw_manifests_dir to replace previous instances of "{{ cifmw_basedir }}/artifacts/manifests" - This new var should be used throughout the entire framework - Related Jira tasks: (OSPRH-22661) & (OSPRH-26441) Signed-off-by: Brian Jackman --- group_vars/all.yml | 1 + hooks/playbooks/PCI-DSS-pre-deploy.yml | 2 +- hooks/playbooks/barbican-enable-luna.yml | 2 +- hooks/playbooks/barbican-enable-proteccio.yml | 2 +- hooks/playbooks/control_plane_ceph_backends.yml | 4 ++-- hooks/playbooks/control_plane_hci_pre_deploy.yml | 4 ++-- hooks/playbooks/control_plane_horizon.yml | 4 ++-- hooks/playbooks/control_plane_ironic.yml | 4 ++-- hooks/playbooks/fetch_compute_facts.yml | 6 +++--- hooks/playbooks/ipa-controlplane-config.yml | 2 +- playbooks/dcn.yml | 2 +- roles/cleanup_openstack/tasks/main.yaml | 4 ++-- roles/edpm_kustomize/molecule/default/converge.yml | 2 +- roles/edpm_kustomize/molecule/default/prepare.yml | 4 ++-- roles/federation/tasks/hook_controlplane_config.yml | 2 +- roles/federation/tasks/hook_horizon_controlplane_config.yml | 2 +- .../tasks/hook_multirealm_controlplane_config.yml | 2 +- roles/hci_prepare/README.md | 2 +- roles/hci_prepare/defaults/main.yml | 2 +- roles/install_openstack_ca/defaults/main.yml | 2 +- roles/kustomize_deploy/tasks/cleanup.yml | 4 ++-- 21 files changed, 30 insertions(+), 29 deletions(-) diff --git a/group_vars/all.yml b/group_vars/all.yml index bdd0aa0ed7..3217212bc4 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -15,6 +15,7 @@ cifmw_architecture_repo: "{{ ansible_user_dir }}/{{ cifmw_architecture_repo_rela 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" +cifmw_manifests_dir: "{{ cifmw_basedir }}/artifacts/manifests" # Default DNS servers to use across the framework cifmw_default_dns_servers: diff --git a/hooks/playbooks/PCI-DSS-pre-deploy.yml b/hooks/playbooks/PCI-DSS-pre-deploy.yml index be2fc45083..05f37e927d 100644 --- a/hooks/playbooks/PCI-DSS-pre-deploy.yml +++ b/hooks/playbooks/PCI-DSS-pre-deploy.yml @@ -18,7 +18,7 @@ tasks: - name: Create file to customize keystone for pci dss deployed in the control plane ansible.builtin.copy: - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/keystone_pci_dss.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/controlplane/keystone_pci_dss.yaml" content: |- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization diff --git a/hooks/playbooks/barbican-enable-luna.yml b/hooks/playbooks/barbican-enable-luna.yml index d319e25c52..31014a0294 100644 --- a/hooks/playbooks/barbican-enable-luna.yml +++ b/hooks/playbooks/barbican-enable-luna.yml @@ -45,7 +45,7 @@ client_data_secret: "{{ cifmw_hsm_luna_client_data_secret | default('barbican-luna-client-data', true) }}" login_secret: "{{ cifmw_hsm_login_secret | default('barbican-luna-login', true) }}" ansible.builtin.copy: - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/93-barbican-luna.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/controlplane/93-barbican-luna.yaml" mode: "0644" content: |- apiVersion: kustomize.config.k8s.io/v1beta1 diff --git a/hooks/playbooks/barbican-enable-proteccio.yml b/hooks/playbooks/barbican-enable-proteccio.yml index 3f5f27abdc..4debb061ca 100644 --- a/hooks/playbooks/barbican-enable-proteccio.yml +++ b/hooks/playbooks/barbican-enable-proteccio.yml @@ -8,7 +8,7 @@ login_secret: "{{ cifmw_hsm_login_secret | default('barbican-proteccio-login', true) }}" ansible.builtin.copy: mode: '0644' - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/93-barbican-proteccio.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/controlplane/93-barbican-proteccio.yaml" content: |- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization diff --git a/hooks/playbooks/control_plane_ceph_backends.yml b/hooks/playbooks/control_plane_ceph_backends.yml index 9d04193788..02dbea3f13 100644 --- a/hooks/playbooks/control_plane_ceph_backends.yml +++ b/hooks/playbooks/control_plane_ceph_backends.yml @@ -17,12 +17,12 @@ - name: Ensure the kustomizations dir exists ansible.builtin.file: - path: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane" + path: "{{ cifmw_manifests_dir }}/kustomizations/controlplane" state: directory mode: "0755" - name: Create kustomization to add Ceph as backend ansible.builtin.template: - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/90-ceph-backends-kustomization.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/controlplane/90-ceph-backends-kustomization.yaml" src: "config_ceph_backends.yaml.j2" mode: "0644" diff --git a/hooks/playbooks/control_plane_hci_pre_deploy.yml b/hooks/playbooks/control_plane_hci_pre_deploy.yml index c24493bb2c..031806c010 100644 --- a/hooks/playbooks/control_plane_hci_pre_deploy.yml +++ b/hooks/playbooks/control_plane_hci_pre_deploy.yml @@ -5,13 +5,13 @@ tasks: - name: Ensure the kustomizations dir exists ansible.builtin.file: - path: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane" + path: "{{ cifmw_manifests_dir }}/kustomizations/controlplane" state: directory mode: "0755" - name: Create kustomization for HCI pre deploy step ansible.builtin.copy: - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/95-hci-pre-kustomization.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/controlplane/95-hci-pre-kustomization.yaml" content: |- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization diff --git a/hooks/playbooks/control_plane_horizon.yml b/hooks/playbooks/control_plane_horizon.yml index 852298c741..bc18fa7aa7 100644 --- a/hooks/playbooks/control_plane_horizon.yml +++ b/hooks/playbooks/control_plane_horizon.yml @@ -5,13 +5,13 @@ tasks: - name: Ensure the kustomizations dir exists ansible.builtin.file: - path: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane" + path: "{{ cifmw_manifests_dir }}/kustomizations/controlplane" state: directory mode: "0755" - name: Create kustomize yaml to enable Horizon ansible.builtin.copy: - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/80-horizon-kustomization.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/controlplane/80-horizon-kustomization.yaml" content: |- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization diff --git a/hooks/playbooks/control_plane_ironic.yml b/hooks/playbooks/control_plane_ironic.yml index 74153ed924..65f1b2c0c3 100644 --- a/hooks/playbooks/control_plane_ironic.yml +++ b/hooks/playbooks/control_plane_ironic.yml @@ -5,13 +5,13 @@ tasks: - name: Ensure the kustomizations dir exists ansible.builtin.file: - path: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane" + path: "{{ cifmw_manifests_dir }}/kustomizations/controlplane" state: directory mode: "0755" - name: Create kustomization to enable ironic ansible.builtin.copy: - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/98-ironic-kustomization.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/controlplane/98-ironic-kustomization.yaml" content: |- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization diff --git a/hooks/playbooks/fetch_compute_facts.yml b/hooks/playbooks/fetch_compute_facts.yml index de5224bd02..fee9769970 100644 --- a/hooks/playbooks/fetch_compute_facts.yml +++ b/hooks/playbooks/fetch_compute_facts.yml @@ -76,7 +76,7 @@ - name: Ensure the kustomizations dirs exists ansible.builtin.file: - path: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/{{ item }}" + path: "{{ cifmw_manifests_dir }}/kustomizations/{{ item }}" state: directory mode: "0755" loop: @@ -85,7 +85,7 @@ - name: Create OpenStackControlPlane CR Kustomization ansible.builtin.copy: - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/99-kustomization.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/controlplane/99-kustomization.yaml" content: |- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization @@ -138,7 +138,7 @@ dns_servers: "{{ ((['192.168.122.10'] + ansible_facts['dns']['nameservers']) | unique)[0:2] }}" ansible.builtin.copy: mode: "0644" - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/dataplane/99-kustomization.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/dataplane/99-kustomization.yaml" content: |- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization diff --git a/hooks/playbooks/ipa-controlplane-config.yml b/hooks/playbooks/ipa-controlplane-config.yml index 97c74ed1b0..1a005a6fee 100644 --- a/hooks/playbooks/ipa-controlplane-config.yml +++ b/hooks/playbooks/ipa-controlplane-config.yml @@ -4,7 +4,7 @@ tasks: - name: Create file to customize keystone for IPA deployed in the control plane ansible.builtin.copy: - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/keystone_ldap.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/controlplane/keystone_ldap.yaml" content: |- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization diff --git a/playbooks/dcn.yml b/playbooks/dcn.yml index 430e2b8733..853d08836c 100644 --- a/playbooks/dcn.yml +++ b/playbooks/dcn.yml @@ -147,7 +147,7 @@ - name: Copy found CR files to the manifests folder ansible.builtin.copy: src: "{{ item.path }}" - dest: "{{ ansible_user_dir }}/ci-framework-data/artifacts/manifests/openstack/cr" + dest: "{{ cifmw_manifests_dir }}/openstack/cr" mode: "0644" loop: "{{ dcn_crs.files }}" when: dcn_crs.matched > 0 diff --git a/roles/cleanup_openstack/tasks/main.yaml b/roles/cleanup_openstack/tasks/main.yaml index 567a9e12c2..4841d55b85 100644 --- a/roles/cleanup_openstack/tasks/main.yaml +++ b/roles/cleanup_openstack/tasks/main.yaml @@ -97,8 +97,8 @@ | unique }} _external_dns_crs: - - "{{ cifmw_basedir }}/artifacts/manifests/cifmw_external_dns/ceph-local-dns.yml" - - "{{ cifmw_basedir }}/artifacts/manifests/cifmw_external_dns/ceph-local-cert.yml" + - "{{ cifmw_manifests_dir }}/cifmw_external_dns/ceph-local-dns.yml" + - "{{ cifmw_manifests_dir }}/cifmw_external_dns/ceph-local-cert.yml" _operators_crs: - "{{ cifmw_kustomize_deploy_nmstate_dest_file }}" - "{{ cifmw_kustomize_deploy_metallb_dest_file }}" diff --git a/roles/edpm_kustomize/molecule/default/converge.yml b/roles/edpm_kustomize/molecule/default/converge.yml index 5fd4fcdde5..66a125c1cb 100644 --- a/roles/edpm_kustomize/molecule/default/converge.yml +++ b/roles/edpm_kustomize/molecule/default/converge.yml @@ -19,7 +19,7 @@ hosts: all vars: cifmw_basedir: "{{ ansible_user_dir }}/ci-framework-data" - cifmw_edpm_kustomize_cr_path: "{{ cifmw_basedir }}/artifacts/manifests/openstack/dataplane/cr/dataplane_v1beta1_openstackdataplanenodeset.yaml" + cifmw_edpm_kustomize_cr_path: "{{ cifmw_manifests_dir }}/openstack/dataplane/cr/dataplane_v1beta1_openstackdataplanenodeset.yaml" cifmw_path: "{{ ansible_user_dir }}/.crc/bin:{{ ansible_user_dir }}/.crc/bin/oc:{{ ansible_user_dir }}/bin:{{ ansible_env.PATH }}" tasks: - name: Run without any kustomization diff --git a/roles/edpm_kustomize/molecule/default/prepare.yml b/roles/edpm_kustomize/molecule/default/prepare.yml index 2070f402fd..9645659999 100644 --- a/roles/edpm_kustomize/molecule/default/prepare.yml +++ b/roles/edpm_kustomize/molecule/default/prepare.yml @@ -32,7 +32,7 @@ block: - name: Create directory tree ansible.builtin.file: - path: "{{ cifmw_basedir }}/artifacts/manifests/openstack/dataplane/cr" + path: "{{ cifmw_manifests_dir }}/openstack/dataplane/cr" state: directory mode: "0755" @@ -47,4 +47,4 @@ mode: "0644" remote_src: true src: "{{ cifmw_basedir }}/src/openstack-operator/config/samples/dataplane_v1beta1_openstackdataplanenodeset.yaml" - dest: "{{ cifmw_basedir }}/artifacts/manifests/openstack/dataplane/cr/dataplane_v1beta1_openstackdataplanenodeset.yaml" + dest: "{{ cifmw_manifests_dir }}/openstack/dataplane/cr/dataplane_v1beta1_openstackdataplanenodeset.yaml" diff --git a/roles/federation/tasks/hook_controlplane_config.yml b/roles/federation/tasks/hook_controlplane_config.yml index c1974c1e50..eadc6f01ed 100644 --- a/roles/federation/tasks/hook_controlplane_config.yml +++ b/roles/federation/tasks/hook_controlplane_config.yml @@ -16,7 +16,7 @@ - name: Create file to customize keystone for Federation resources deployed in the control plane ansible.builtin.copy: - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/keystone_federation.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/controlplane/keystone_federation.yaml" content: |- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization diff --git a/roles/federation/tasks/hook_horizon_controlplane_config.yml b/roles/federation/tasks/hook_horizon_controlplane_config.yml index 43b42d3668..54bbe6d77e 100644 --- a/roles/federation/tasks/hook_horizon_controlplane_config.yml +++ b/roles/federation/tasks/hook_horizon_controlplane_config.yml @@ -28,7 +28,7 @@ - name: Create file to customize horizon for Federation resources deployed in the control plane ansible.builtin.copy: - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/horizon_federation.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/controlplane/horizon_federation.yaml" mode: preserve content: |- apiVersion: kustomize.config.k8s.io/v1beta1 diff --git a/roles/federation/tasks/hook_multirealm_controlplane_config.yml b/roles/federation/tasks/hook_multirealm_controlplane_config.yml index eb2421dd3f..36b9e7d145 100644 --- a/roles/federation/tasks/hook_multirealm_controlplane_config.yml +++ b/roles/federation/tasks/hook_multirealm_controlplane_config.yml @@ -16,7 +16,7 @@ - name: Create file to customize keystone for IPA deployed in the control plane ansible.builtin.copy: - dest: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/controlplane/keystone_multirealm_federation.yaml" + dest: "{{ cifmw_manifests_dir }}/kustomizations/controlplane/keystone_multirealm_federation.yaml" content: |- apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization diff --git a/roles/hci_prepare/README.md b/roles/hci_prepare/README.md index 6489272d6d..0654d27b56 100644 --- a/roles/hci_prepare/README.md +++ b/roles/hci_prepare/README.md @@ -6,7 +6,7 @@ None. ## Parameters * `cifmw_hci_prepare_basedir`: (String) Base directory. Defaults to `cifmw_basedir` which defaults to `~/ci-framework-data`. -* `cifmw_hci_prepare_dataplane_dir`: (String) Directory in where `edpm_deploy` role will search for DataPlane kustomizations. Defaults to `"{{ cifmw_basedir }}/artifacts/manifests/kustomizations/dataplane"`. +* `cifmw_hci_prepare_dataplane_dir`: (String) Directory in where `edpm_deploy` role will search for DataPlane kustomizations. Defaults to `"{{ cifmw_manifests_dir }}kustomizations/dataplane"`. * `cifmw_hci_prepare_dryrun`: (Boolean) Perform a dry run on a set of commands. Defaults to `False`. * `cifmw_hci_prepare_skip_load_parameters`: Skip the initial `load_parameters` step, which load vars to gather network information. Defaults to `False`. * `cifmw_hci_prepare_ceph_secret_path`: "/tmp/k8s_ceph_secret.yml" diff --git a/roles/hci_prepare/defaults/main.yml b/roles/hci_prepare/defaults/main.yml index 2b130fdc47..620cd4aeca 100644 --- a/roles/hci_prepare/defaults/main.yml +++ b/roles/hci_prepare/defaults/main.yml @@ -15,7 +15,7 @@ # under the License. cifmw_hci_prepare_basedir: "{{ cifmw_basedir }}" -cifmw_hci_prepare_dataplane_dir: "{{ cifmw_basedir }}/artifacts/manifests/kustomizations/dataplane" +cifmw_hci_prepare_dataplane_dir: "{{ cifmw_manifests_dir }}/kustomizations/dataplane" cifmw_hci_prepare_dryrun: false cifmw_hci_prepare_skip_load_parameters: false cifmw_hci_prepare_ceph_secret_path: "/tmp/k8s_ceph_secret.yml" diff --git a/roles/install_openstack_ca/defaults/main.yml b/roles/install_openstack_ca/defaults/main.yml index 1b7d915eba..a7d53c4957 100644 --- a/roles/install_openstack_ca/defaults/main.yml +++ b/roles/install_openstack_ca/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_install_openstack_ca" -cifmw_install_openstack_ca_dest_path: "{{ cifmw_basedir }}/artifacts/manifests" +cifmw_install_openstack_ca_dest_path: "{{ cifmw_manifests_dir }}" cifmw_install_openstack_ca_file: "tls-ca-bundle.pem" cifmw_install_openstack_ca_file_full_path: >- {{ diff --git a/roles/kustomize_deploy/tasks/cleanup.yml b/roles/kustomize_deploy/tasks/cleanup.yml index 89f179eb17..a6527a46a0 100644 --- a/roles/kustomize_deploy/tasks/cleanup.yml +++ b/roles/kustomize_deploy/tasks/cleanup.yml @@ -50,8 +50,8 @@ - "{{ cifmw_kustomize_deploy_kustomizations_dest_dir }}/openstack.yaml" - "{{ cifmw_kustomize_deploy_olm_dest_file }}" _external_dns_crs: - - "{{ ansible_user_dir }}/ci-framework-data/artifacts/manifests/cifmw_external_dns/ceph-local-dns.yml" - - "{{ ansible_user_dir }}/ci-framework-data/artifacts/manifests/cifmw_external_dns/ceph-local-cert.yml" + - "{{ cifmw_manifests_dir }}/cifmw_external_dns/ceph-local-dns.yml" + - "{{ cifmw_manifests_dir }}/cifmw_external_dns/ceph-local-cert.yml" register: _cifmw_kustomize_files ansible.builtin.set_fact: cifmw_kustomize_deploy_crs_to_delete: >-