Skip to content

Commit 90a2568

Browse files
committed
Bump Ubuntu to 22.04 (required for newest OpenStack)
1 parent 169fd1c commit 90a2568

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

docs/book/src/development/ci.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The entry point for the creation of the test DevStack is `hack/ci/create_devstac
2828

2929
### DevStack OS
3030

31-
In GCE, DevStack is installed on a community-maintained Ubuntu 20.04 LTS cloud image. The cloud-init config is also intended to work on CentOS 8, and this is known to work as of 2021-01-12. However, note that this is not regularly tested. See the comment in `hack/ci/gce-project.sh` for how to deploy on CentOS.
31+
In GCE, DevStack is installed on a community-maintained Ubuntu 22.04 LTS cloud image. The cloud-init config is also intended to work on CentOS 8, and this is known to work as of 2021-01-12. However, note that this is not regularly tested. See the comment in `hack/ci/gce-project.sh` for how to deploy on CentOS.
3232

3333
It is convenient to the project to have a viable second OS option as it gives us an option to work around issues which only affect one or the other. This is most likely when enabling new DevStack features, but may also include infrastructure issues. Consequently, when making changes to cloud-init, try not to use features specific to Ubuntu or CentOS. DevStack already supports both operating systems, so we just need to be careful in our peripheral configuration, for example by using cloud-init's `packages` module rather than manually invoking `apt-get` or `yum`. Fortunately package names tend to be consistent across the two distributions.
3434

@@ -40,13 +40,13 @@ We configure a 2 node DevStack. `controller` is running:
4040
* Nova: all services, including compute
4141
* Glance: all services
4242
* Octavia: all services
43-
* Neutron: all services with ML2/OVS, including L3 agent
43+
* Neutron: all services with ML2/OVN
4444
* Cinder: all services, including volume with default LVM/iSCSI backend
4545

4646
`worker` is running:
4747

4848
* Nova: compute only
49-
* Neutron: agent only (not L3 agent)
49+
* Neutron: OVN agents only
5050
* Cinder: volume only with default LVM/iSCSI backend
5151

5252
`controller` is using the `n2-standard-16` machine type with 16 vCPUs and 64 GB RAM. `worker` is using the `n2-standard-8` machine type with 8 vCPUs and 32 GB RAM. Each job has a quota limit of 24 vCPUs.

hack/ci/aws-project.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ function cloud_init {
2323
AWS_ZONE=${AWS_ZONE:-"eu-central-1a"}
2424
# AMIs:
2525
# * capa-ami-ubuntu-20.04-1.20.4-00-1613898574 id: ami-0120656d38c206057
26-
# * ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210223 id: ami-0767046d1677be5a0
27-
AWS_AMI=${AWS_AMI:-"ami-0767046d1677be5a0"}
26+
# * ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20231207 id: ami-05d47d29a4c2d19e1
27+
AWS_AMI=${AWS_AMI:-"ami-05d47d29a4c2d19e1"}
2828
# Choose via: https://eu-central-1.console.aws.amazon.com/ec2/v2/home?region=eu-central-1#InstanceTypes:
2929
AWS_MACHINE_TYPE=${AWS_MACHINE_TYPE:-"c5.metal"}
3030
AWS_NETWORK_NAME=${AWS_NETWORK_NAME:-"${CLUSTER_NAME}-mynetwork"}

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-2004-lts \
98+
--image-family ubuntu-2204-lts \
9999
--boot-disk-size 200G \
100100
--boot-disk-type pd-ssd \
101101
--can-ip-forward \

hack/ci/openstack.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ function cloud_init {
3030
OPENSTACK_SUBNET_NAME=${OPENSTACK_SUBNET_NAME:-${CLUSTER_NAME}-subnet}
3131
OPENSTACK_SECGROUP_NAME=${OPENSTACK_SECGROUP_NAME:-${CLUSTER_NAME}-secgroup}
3232
OPENSTACK_ROUTER_NAME=${OPENSTACK_ROUTER_NAME:-${CLUSTER_NAME}-router}
33-
OPENSTACK_IMAGE_NAME=${OPENSTACK_IMAGE_NAME:-ubuntu-2004-lts}
33+
OPENSTACK_IMAGE_NAME=${OPENSTACK_IMAGE_NAME:-ubuntu-2204-lts}
3434

3535
OPENSTACK_FLAVOR=${OPENSTACK_FLAVOR:-m1.xlarge}
3636
OPENSTACK_FLAVOR_controller=${OPENSTACK_FLAVOR_controller:-$OPENSTACK_FLAVOR}
@@ -88,9 +88,9 @@ function init_infrastructure() {
8888
# We don't tag the image with the cluster name as we expect it to be shared
8989
if ! imageid=$(openstack image show "$OPENSTACK_IMAGE_NAME" -f value -c id 2>/dev/null)
9090
then
91-
curl -o /tmp/ubuntu-2004.qcow2 https://cloud-images.ubuntu.com/releases/focal/release/ubuntu-20.04-server-cloudimg-amd64.img
92-
imageid=$(openstack image create --disk-format qcow2 --file /tmp/ubuntu-2004.qcow2 "$OPENSTACK_IMAGE_NAME" -f value -c id)
93-
rm /tmp/ubuntu-2004.qcow2
91+
curl -o /tmp/ubuntu-2204.qcow2 https://cloud-images.ubuntu.com/releases/jammy/release/ubuntu-22.04-server-cloudimg-amd64.img
92+
imageid=$(openstack image create --disk-format qcow2 --file /tmp/ubuntu-2204.qcow2 "$OPENSTACK_IMAGE_NAME" -f value -c id)
93+
rm /tmp/ubuntu-2204.qcow2
9494
fi
9595
}
9696

0 commit comments

Comments
 (0)