commit 7970a495c04a680828936b8e9880d5de9077ec37
author vexxhost-bot <105816074+vexxhost-bot@users.noreply.github.com> Tue Oct 29 12:32:11 2024 -0400
committer GitHub <noreply@github.com> Tue Oct 29 16:32:11 2024 +0000
tree 2c2284b381eb471e3ebc193c8152863a41e69c62
parent 5baf7213ad2ea75e70bc332bfa36e123524be786

[stable/2023.1] [ATMOSPHERE-530] update magnum images to  1.29.6 1.30.2 1.31.1 (#2056)

This is an automated cherry-pick of #1979
/assign yaguangtang

molecule/aio/group_vars/all/molecule.yml

diff --git a/molecule/aio/group_vars/all/molecule.yml b/molecule/aio/group_vars/all/molecule.yml
index f5540fd..9d8942a 100644
--- a/molecule/aio/group_vars/all/molecule.yml
+++ b/molecule/aio/group_vars/all/molecule.yml
@@ -224,10 +224,7 @@
       api: 1
       conductor: 1
 magnum_image_disk_format: qcow2
-magnum_images:
-  - name: ubuntu-2204-kube-v1.27.8s
-    url: https://object-storage.public.mtl1.vexxhost.net/swift/v1/a91f106f55e64246babde7402c21b87a/magnum-capi/ubuntu-2204-kube-v1.27.8.qcow2
-    distro: ubuntu
+magnum_images: "[ {{ _magnum_images[-1] }} ]"
 
 manila_helm_values:
   conf:

roles/magnum/defaults/main.yml

diff --git a/roles/magnum/defaults/main.yml b/roles/magnum/defaults/main.yml
index 60cd1a7..88ab90b 100644
--- a/roles/magnum/defaults/main.yml
+++ b/roles/magnum/defaults/main.yml
@@ -42,16 +42,7 @@
 # List of images to load into OpenStack for Magnum
 magnum_image_container_format: bare
 magnum_image_disk_format: raw
-magnum_images:
-  - name: ubuntu-2204-kube-v1.25.11
-    url: https://object-storage.public.mtl1.vexxhost.net/swift/v1/a91f106f55e64246babde7402c21b87a/magnum-capi/ubuntu-2204-kube-v1.25.11.qcow2
-    distro: ubuntu
-  - name: ubuntu-2204-kube-v1.26.6
-    url: https://object-storage.public.mtl1.vexxhost.net/swift/v1/a91f106f55e64246babde7402c21b87a/magnum-capi/ubuntu-2204-kube-v1.26.6.qcow2
-    distro: ubuntu
-  - name: ubuntu-2204-kube-v1.27.3
-    url: https://object-storage.public.mtl1.vexxhost.net/swift/v1/a91f106f55e64246babde7402c21b87a/magnum-capi/ubuntu-2204-kube-v1.27.3.qcow2
-    distro: ubuntu
+magnum_images: "{{ _magnum_images }}"
 
 magnum_cluster_api_proxy_ovs_node_selector:
   openstack-control-plane: enabled

roles/magnum/vars/main.yml

diff --git a/roles/magnum/vars/main.yml b/roles/magnum/vars/main.yml
index 99ef849..2f348ed 100644
--- a/roles/magnum/vars/main.yml
+++ b/roles/magnum/vars/main.yml
@@ -94,3 +94,14 @@
     service_ingress_api: false
 
 _magnum_registry_ingress_annotations: {}
+
+_magnum_images:
+  - name: ubuntu-2204-kube-v1.29.6
+    url: https://static.atmosphere.dev/artifacts/magnum-cluster-api/ubuntu-jammy-kubernetes-1-29-6-1720107687.qcow2
+    distro: ubuntu
+  - name: ubuntu-2204-kube-v1.30.2
+    url: https://static.atmosphere.dev/artifacts/magnum-cluster-api/ubuntu-jammy-kubernetes-1-30-2-1720107688.qcow2
+    distro: ubuntu
+  - name: ubuntu-2204-kube-v1.31.1
+    url: https://static.atmosphere.dev/artifacts/magnum-cluster-api/ubuntu-jammy-kubernetes-1-31-1-1728920853.qcow2
+    distro: ubuntu