starlingx/openstack-armada-app
Code Issues Proposed changes

Fix: build-pkgs openstack-helm broken on master build

Browse Source 
This commit fixes the build-pkgs error in openstack-helm on the master build.
Updates the patch reference after rebasing the previously updated
commit

TEST PLAN:
    All tests were run on the following environment:
    Virtual Environment with AIO-SX + NetApp simulator
    PASS - build-pkgs -a -l openstack
    PASS - build stx-openstack tarball
    PASS - application upload, apply and remove
    PASS - apply on Ceph only: ceph bootstrapped, netapp logic skipped and
           an openstack image must be created
    PASS - apply on NetApp only: ceph logic skipped, show netapp message
           and an openstack image must be created
    PASS - apply on Ceph and NetApp: ceph bootstrapped, show netapp message
           and an openstack image must be created

Closes-Bug: 2137000

Change-Id: I339c75cb5720bfd9d613657b32ff1d86250ba234
Signed-off-by: Thiago Miranda <tmarques@windriver.com>
This commit is contained in:
Thiago Miranda
2025-12-22 12:29:37 -03:00
committed by Thiago Antonio Miranda
parent 962c5fbd29
commit f24abb1d2f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openstack-helm/debian/deb_folder/patches/0032-Add-backend-checks-to-skip-Ceph-init-for-NetApp-stor.patch
+4 -4
View File
@@ -1,6 +1,6 @@
From 5d77d05f29b7589c801c8980aa438854dbb3b7ec Mon Sep 17 00:00:00 2001
From 714138e7e95a5a6c5845d62a0c86c53edf259ad5 Mon Sep 17 00:00:00 2001
From: Thiago Miranda <tmarques@windriver.com>
Date: Mon, 24 Nov 2025 09:45:21 -0300
Date: Mon, 22 Dec 2025 11:57:55 -0300
Subject: [PATCH] Add backend checks to skip Ceph init for NetApp storage
Introduce conditional logic to skip Ceph initialization when using
@@ -43,7 +43,7 @@ index f780ff9e8..0df7cee8d 100644
function ensure_pool () {
if [ "$2" -eq 0 ]; then
diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml
index 22cd41098..8e35ace31 100644
index 5e6a210ab..db3aabdd0 100644
--- a/glance/templates/job-storage-init.yaml
+++ b/glance/templates/job-storage-init.yaml
@@ -112,6 +112,10 @@ spec:
@@ -56,7 +56,7 @@ index 22cd41098..8e35ace31 100644
+ {{- end }}
{{- if eq .Values.storage "rbd" }}
- name: RBD_POOL_NAME
value: {{ .Values.conf.glance.glance_store.rbd_store_pool | quote }}
value: {{ .Values.conf.glance.rbd.rbd_store_pool | quote }}
--
2.34.1