Skip to content

🌱 Run devstack on ubuntu 24.04 #2302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 2 commits into from
Dec 5, 2024
Merged

🌱 Run devstack on ubuntu 24.04 #2302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a86c5a
Run devstack on ubuntu 24.04 and bump to 2024.2
lentzi90 Dec 4, 2024
0a28aae
test: Temporarily disable deep image inspection in Nova
stephenfin Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions hack/ci/cloud-init/controller.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@
# query_placement_for_availability_zone is the default from Xena
query_placement_for_availability_zone = True

[workarounds]
# FIXME(stephenfin): This is temporary while we get to the bottom of
# https://bugs.launchpad.net/nova/+bug/2091114 It should not be kept after
# we bump to 2025.1
disable_deep_image_inspection = True

[[post-config|$CINDER_CONF]]
[DEFAULT]
storage_availability_zone = ${PRIMARY_AZ}
Expand Down
6 changes: 6 additions & 0 deletions hack/ci/cloud-init/worker.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
[DEFAULT]
cpu_allocation_ratio = 2.0

[workarounds]
# FIXME(stephenfin): This is temporary while we get to the bottom of
# https://bugs.launchpad.net/nova/+bug/2091114 It should not be kept after
# we bump to 2025.1
disable_deep_image_inspection = True

[[post-config|$CINDER_CONF]]
[DEFAULT]
storage_availability_zone = ${SECONDARY_AZ}
Expand Down
2 changes: 1 addition & 1 deletion hack/ci/create_devstack.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ source "${scriptdir}/${RESOURCE_TYPE}.sh"

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

OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"2024.1"}
OPENSTACK_RELEASE=${OPENSTACK_RELEASE:-"2024.2"}
OPENSTACK_ENABLE_HORIZON=${OPENSTACK_ENABLE_HORIZON:-"false"}

# Devstack will create a provider network using this range
Expand Down
2 changes: 1 addition & 1 deletion hack/ci/gce-project.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function create_vm {
--zone "$GCP_ZONE" \
--enable-nested-virtualization \
--image-project ubuntu-os-cloud \
--image-family ubuntu-2204-lts \
--image-family ubuntu-2404-lts-amd64 \
--boot-disk-size 200G \
--boot-disk-type pd-ssd \
--can-ip-forward \
Expand Down
4 changes: 2 additions & 2 deletions hack/ci/libvirt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ set -x -o errexit -o nounset -o pipefail

function cloud_init {
LIBVIRT_NETWORK_NAME=${LIBVIRT_NETWORK_NAME:-${CLUSTER_NAME}-network}
LIBVIRT_IMAGE_NAME=${LIBVIRT_IMAGE_NAME:-ubuntu-2204-lts}
LIBVIRT_IMAGE_NAME=${LIBVIRT_IMAGE_NAME:-ubuntu-2404-lts}

LIBVIRT_MEMORY=${LIBVIRT_MEMORY:-8192}
LIBVIRT_MEMORY_controller=${LIBVIRT_MEMORY_controller:-$LIBVIRT_MEMORY}
Expand Down Expand Up @@ -65,7 +65,7 @@ EOF
fi

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

Expand Down