From 3fc5effe155d81948f2474178eab0dfd8fef3a10 Mon Sep 17 00:00:00 2001
From: Eliezer Croitoru <ngtech1ltd2gmail.com>
Date: Wed, 25 Feb 2026 01:43:10 +0200
Subject: [PATCH] Updated openstack flavours

---
 openstack-flavours-and-images.sh | 71 ++++++++++++++++++++++++++++----
 1 file changed, 63 insertions(+), 8 deletions(-)

diff --git a/openstack-flavours-and-images.sh b/openstack-flavours-and-images.sh
index 465d578..ae32e6a 100755
--- a/openstack-flavours-and-images.sh
+++ b/openstack-flavours-and-images.sh
@@ -7,12 +7,27 @@ if [ -f "/etc/kolla/admin-openrc.sh" ];then
 	source /etc/kolla/admin-openrc.sh
 fi
 
-if [ -f "/opt/deploy/bin/activate" ];then
-	source /opt/deploy/bin/activate
-else
-	echo "Missing kolla venv"
-	exit 1
-fi
+# We use 'true' as the switch, and execute the test [ -f ... ] inside the cases
+case true in
+    $([ -f "/opt/deploy/bin/activate" ] && echo true))
+        source /opt/deploy/bin/activate
+        ;;
+    $([ -f "/etc/kolla/venv/bin/activate" ] && echo true))
+        source /etc/kolla/venv/bin/activate
+        ;;
+
+    $([ -f "/opt/ansible-kolla-venv/bin/activate" ] && echo true))
+        source "/opt/ansible-kolla-venv/bin/activate"
+        ;;
+
+    $([ -f "$HOME/venv/bin/activate" ] && echo true))
+        source "$HOME/venv/bin/activate"
+        ;;
+    *)
+        echo "Error: No valid kolla venv found."
+        exit 1
+        ;;
+esac
 
 IMAGES_DIR="images"
 
@@ -146,7 +161,7 @@ openstack image create "rockylinux-10" \
 
 
 ALMALINUX10_IMAGE_URL="https://repo.almalinux.org/almalinux/10/cloud/x86_64/images/AlmaLinux-10-GenericCloud-latest.x86_64.qcow2"
-ALMALINUX10_IMAGE_NAME="https://repo.almalinux.org/almalinux/10/cloud/x86_64/images/AlmaLinux-10-GenericCloud-latest.x86_64.qcow2"
+ALMALINUX10_IMAGE_NAME="AlmaLinux-10-GenericCloud-latest.x86_64.qcow2"
 ALMALINUX10_LOCAL_IMAGE_URL="https://http://www.ngtech.home/static/cloud-images/images/AlmaLinux-10-GenericCloud-latest.x86_64.qcow2"
 
 if [ -f "try-local-images" ];then
@@ -154,7 +169,7 @@ if [ -f "try-local-images" ];then
 fi
 
 if [ ! -f "${IMAGES_DIR}/${ALMALINUX10_IMAGE_NAME}" ];then
-        wget "${ALMALINUX10_LOCAL_IMAGE_URL}" -O "${IMAGES_DIR}/${ALMALINUX10_IMAGE_NAME}"
+        wget "${ALMALINUX10_IMAGE_URL}" -O "${IMAGES_DIR}/${ALMALINUX10_IMAGE_NAME}"
 fi
 
 openstack image show "rockylinux-10" || \
@@ -226,6 +241,25 @@ openstack image create "debian-12" \
         --file "${IMAGES_DIR}/${DEBIAN_12_IMAGE_NAME}" \
 	--public
 
+DEBIAN_13_IMAGE_URL="https://cloud.debian.org/images/cloud/trixie/latest/debian-13-generic-amd64.qcow2"
+DEBIAN_13_IMAGE_NAME="debian-13-generic-amd64.qcow2"
+
+DEBIAN_13_LOCAL_IMAGE_URL="http://www.ngtech.home/static/cloud-images/debian-13-generic-amd64.qcow2"
+
+if [ -f "try-local-images" ];then
+	( curl -I "${DEBIAN_13_LOCAL_IMAGE_URL}" | grep 'HTTP/1.1 200 OK' ) && DEBIAN_13_IMAGE_URL="${DEBIAN_13_LOCAL_IMAGE_URL}"
+fi
+
+if [ ! -f "${IMAGES_DIR}/${DEBIAN_13_IMAGE_NAME}" ];then
+	wget "${DEBIAN_12_IMAGE_URL}" -O "${IMAGES_DIR}/${DEBIAN_12_IMAGE_NAME}"
+fi
+
+openstack image show "debian-13" || \
+openstack image create "debian-13" \
+        --container-format bare \
+        --disk-format qcow2 \
+        --file "${IMAGES_DIR}/${DEBIAN_13_IMAGE_NAME}" \
+	--public
 
 UBUNTU_JAMMY_IMAGE_URL="https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
 UBUNTU_JAMMY_IMAGE_NAME="jammy-server-cloudimg-amd64.img"
@@ -267,6 +301,27 @@ openstack image create "ubuntu-focal" \
         --file "${IMAGES_DIR}/${UBUNTU_FOCAL_IMAGE_NAME}" \
         --public
 
+UBUNTU_NOBLE_IMAGE_URL="https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img"
+UBUNTU_NOBLE_IMAGE_NAME="noble-server-cloudimg-amd64.img"
+
+UBUNTU_NOBLE_LOCAL_IMAGE_URL="http://www.ngtech.home/static/cloud-images/noble-server-cloudimg-amd64.img"
+
+if [ -f "try-local-images" ];then
+	(curl -I "${UBUNTU_NOBLE_LOCAL_IMAGE_URL}" | grep 'HTTP/1.1 200 OK' ) && UBUNTU_NOBLE_IMAGE_URL="${UBUNTU_NOBLE_LOCAL_IMAGE_URL}"
+fi
+
+if [ ! -f "${IMAGES_DIR}/${UBUNTU_NOBLE_IMAGE_NAME}" ];then
+	wget "${UBUNTU_NOBLE_IMAGE_URL}" -O "${IMAGES_DIR}/${UBUNTU_NOBLE_IMAGE_NAME}"
+fi
+
+openstack image show "ubuntu-noble" || \
+openstack image create "ubuntu-noble" \
+        --container-format bare \
+        --disk-format qcow2 \
+        --file "${IMAGES_DIR}/${UBUNTU_NOBLE_IMAGE_NAME}" \
+        --public
+
+
 CENTOS8_IMAGE_URL="https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-latest.x86_64.qcow2"
 CENTOS8_IMAGE_NAME="CentOS-Stream-GenericCloud-8-latest.x86_64.qcow2"