Skip to content

Commit cf34c5a

Browse files
authored
Merge pull request #2302 from Nordix/lentzi90/devstack-ubuntu-2404
🌱 Run devstack on ubuntu 24.04
2 parents 7c38ac8 + 0a28aae commit cf34c5a

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

hack/ci/cloud-init/controller.yaml.tpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@
8181
# query_placement_for_availability_zone is the default from Xena
8282
query_placement_for_availability_zone = True
8383

84+
[workarounds]
85+
# FIXME(stephenfin): This is temporary while we get to the bottom of
86+
# https://bugs.launchpad.net/nova/+bug/2091114 It should not be kept after
87+
# we bump to 2025.1
88+
disable_deep_image_inspection = True
89+
8490
[[post-config|$CINDER_CONF]]
8591
[DEFAULT]
8692
storage_availability_zone = ${PRIMARY_AZ}

hack/ci/cloud-init/worker.yaml.tpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,12 @@
4747
[DEFAULT]
4848
cpu_allocation_ratio = 2.0
4949

50+
[workarounds]
51+
# FIXME(stephenfin): This is temporary while we get to the bottom of
52+
# https://bugs.launchpad.net/nova/+bug/2091114 It should not be kept after
53+
# we bump to 2025.1
54+
disable_deep_image_inspection = True
55+
5056
[[post-config|$CINDER_CONF]]
5157
[DEFAULT]
5258
storage_availability_zone = ${SECONDARY_AZ}

hack/ci/create_devstack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ source "${scriptdir}/${RESOURCE_TYPE}.sh"
3131

3232
CLUSTER_NAME=${CLUSTER_NAME:-"capo-e2e"}
3333

34-
OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"2024.1"}
34+
OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"2024.2"}
3535
OPENSTACK_ENABLE_HORIZON=${OPENSTACK_ENABLE_HORIZON:-"false"}
3636

3737
# Devstack will create a provider network using this range

hack/ci/gce-project.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ function create_vm {
9595
--zone "$GCP_ZONE" \
9696
--enable-nested-virtualization \
9797
--image-project ubuntu-os-cloud \
98-
--image-family ubuntu-2204-lts \
98+
--image-family ubuntu-2404-lts-amd64 \
9999
--boot-disk-size 200G \
100100
--boot-disk-type pd-ssd \
101101
--can-ip-forward \

hack/ci/libvirt.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ set -x -o errexit -o nounset -o pipefail
2525

2626
function cloud_init {
2727
LIBVIRT_NETWORK_NAME=${LIBVIRT_NETWORK_NAME:-${CLUSTER_NAME}-network}
28-
LIBVIRT_IMAGE_NAME=${LIBVIRT_IMAGE_NAME:-ubuntu-2204-lts}
28+
LIBVIRT_IMAGE_NAME=${LIBVIRT_IMAGE_NAME:-ubuntu-2404-lts}
2929

3030
LIBVIRT_MEMORY=${LIBVIRT_MEMORY:-8192}
3131
LIBVIRT_MEMORY_controller=${LIBVIRT_MEMORY_controller:-$LIBVIRT_MEMORY}
@@ -65,7 +65,7 @@ EOF
6565
fi
6666

6767
if [ ! -f "/tmp/${LIBVIRT_IMAGE_NAME}.qcow2" ]; then
68-
curl -o "/tmp/${LIBVIRT_IMAGE_NAME}.qcow2" https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-amd64.img
68+
curl -o "/tmp/${LIBVIRT_IMAGE_NAME}.qcow2" https://cloud-images.ubuntu.com/releases/noble/release/ubuntu-24.04-server-cloudimg-amd64.img
6969
fi
7070
}
7171

0 commit comments

Comments
 (0)