(Jira: OSPRH-22661) Group-Vars: Create the cifmw_manifests_dir group var

brjackma · brjackma · commit 17612e30aed4 · 2026-01-28T14:57:38.000Z
- Create the cifmw_manifests_dir to replace previous instances of "{{ cifmw_basedir }}/artifacts/manifests"
- This new var should be used throughout the entire framework
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: >-
   {{
