Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ version: 2
build:
apt_packages:
- tox
os: ubuntu-22.04
os: ubuntu-24.04
tools:
python: "3.7"
python: "3.12"
jobs:
post_checkout:
- git remote set-branches origin master stackhpc/master stackhpc/2024.1 stackhpc/2023.1 stackhpc/zed stackhpc/yoga stackhpc/xena stackhpc/wallaby
Expand Down
2 changes: 1 addition & 1 deletion doc/source/configuration/host-images.rst
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ in ``etc/kayobe/stackhpc-overcloud-host-images.yml``.
Currently, images exist for the following operating systems:

* Rocky Linux 9
* Ubuntu Jammy 22.04
* Ubuntu Noble 24.04

The image to download is selected automatically using the ``os_distribution``
and ``os_release`` variables. These images are versioned and a variable for
Expand Down
4 changes: 2 additions & 2 deletions doc/source/configuration/ipa.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ post configure`` for Overcloud Ironic. This behaviour can be disabled in

You can also override the distribution version pulled in during deployment,
to do this you can change ``stackhpc_ipa_image_version`` to be the opposite
distribution. For example, the case of switching to Ubuntu 22.04 on a Rocky 9
distribution. For example, the case of switching to Ubuntu 24.04 on a Rocky 9
cloud:

.. code-block:: yaml

stackhpc_ipa_image_version: "{{ stackhpc_ubuntu_jammy_ipa_image_version }}"
stackhpc_ipa_image_version: "{{ stackhpc_ubuntu_noble_ipa_image_version }}"
8 changes: 4 additions & 4 deletions doc/source/configuration/release-train.rst
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Configuration
This configuration provides the following:

* Configuration to deploy a local Pulp service as a container on the seed
* Pulp repository definitions for Rocky Linux 9 and Ubuntu Jammy 22.04
* Pulp repository definitions for Rocky Linux 9 and Ubuntu Noble 24.04
* Playbooks to synchronise a local Pulp service with Ark
* Configuration to use the local Pulp repository mirrors on control plane hosts
* Configuration to use the local Pulp container registry on control plane hosts
Expand Down Expand Up @@ -81,7 +81,7 @@ The Ark pulp credentials issued by StackHPC should be configured in
Package repositories
--------------------

Rocky Linux 9 and Ubuntu Jammy package repositories are synced based on the
Rocky Linux 9 and Ubuntu Noble package repositories are synced based on the
value of ``os_distribution`` and ``os_release``.

On Ark, each package repository provides versioned snapshots using a datetime
Expand All @@ -93,7 +93,7 @@ repository.
Package managers
----------------

For Ubuntu Jammy systems, the package manager configuration is provided by
For Ubuntu Noble systems, the package manager configuration is provided by
``stackhpc_apt_repositories`` in ``etc/kayobe/apt.yml``.

The configuration is applied by default to all Ubuntu hosts. The configuration
Expand All @@ -110,7 +110,7 @@ including i18n files and command-not-found indices. This breaks APT when the

.. code:: console

E: Failed to fetch https://pulp.example.com/pulp/content/ubuntu/jammy-security/development/dists/jammy-security/main/cnf/Commands-amd64 404 Not Found
E: Failed to fetch https://pulp.example.com/pulp/content/ubuntu/noble-security/development/dists/noble-security/main/cnf/Commands-amd64 404 Not Found

The ``purge-command-not-found.yml`` custom playbook can be used to uninstall
the package, prior to running any other APT commands. It may be installed as a
Expand Down
4 changes: 2 additions & 2 deletions doc/source/configuration/security-hardening.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ improvement over an unhardened system. A typical score would be 70%.

The following operating systems are supported:

- Ubuntu 22.04
- Ubuntu 24.04
- Rocky 9

Configuration
Expand All @@ -25,7 +25,7 @@ instance, you may want different rules on a network node compared to a
controller. It is best to consult the upstream role documentation for details
about what each variable does. The documentation can be found here:

- `Ubuntu 22.04 <https://github.com/ansible-lockdown/UBUNTU22-CIS>`__
- `Ubuntu 24.04 <https://github.com/ansible-lockdown/UBUNTU24-CIS>`__
- `Rocky 9 <https://github.com/ansible-lockdown/RHEL9-CIS>`__

Running the playbooks
Expand Down
8 changes: 3 additions & 5 deletions doc/source/contributor/environments/aufn-ceph.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,18 @@ This environment creates a Universe-from-nothing_-style deployment of Kayobe con
Prerequisites
=============

* a baremetal node with at least 64GB of RAM running Rocky Linux 9 or Ubuntu Jammy.

* access to the test pulp server on SMS lab
* a VM or baremetal node with at least 64GB of RAM running Rocky Linux 9 or Ubuntu Noble.

Setup
=====

---

**Note**: The steps detailed below are combined into a convenient script which is packaged with this repo at ``etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh``. For an automated deployment, this script can simply be copied to the baremetal host and then executed as ``bash ~/a-universe-from-nothing.sh``.
**Note**: The steps detailed below are combined into a convenient script which is packaged with this repo at ``etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh``. For an automated deployment, this script can simply be copied to the host and then executed as ``bash ~/a-universe-from-nothing.sh``.

---

To begin the manual setup, access the baremetal node via SSH and install some basic dependencies.
To begin the manual setup, access the node via SSH and install some basic dependencies.

Rocky:

Expand Down
2 changes: 1 addition & 1 deletion doc/source/contributor/environments/ci-aio.rst
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ make changes to the setup process.
Prerequisites
=============

* a Rocky Linux 9 or Ubuntu Jammy 22.04 host
* a Rocky Linux 9 or Ubuntu Noble 24.04 host

Automated Setup
===============
Expand Down
2 changes: 1 addition & 1 deletion doc/source/contributor/environments/ci-builder.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ cases.
Prerequisites
=============

* a Rocky Linux 9 or Ubuntu Jammy 22.04 host
* a Rocky Linux 9 or Ubuntu Noble 24.04 host

Setup
=====
Expand Down
10 changes: 5 additions & 5 deletions doc/source/contributor/environments/ci-multinode.rst
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ Then, run ``kayobe overcloud service deploy`` to deploy Manila.

To test it, you will need two virtual machines. Cirros does not support the Ceph
kernel client, so you will need to use a different image. Any regular Linux
distribution should work. As an example, this guide will use Ubuntu 22.04.
distribution should work. As an example, this guide will use Ubuntu 24.04.

Download the image locally:

.. code-block:: bash

wget https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img
wget https://cloud-images.ubuntu.com/noble/current/noble-server-cloudimg-amd64.img

Upload the image to Glance:

.. code-block:: bash

openstack image create --container-format bare --disk-format qcow2 --file jammy-server-cloudimg-amd64.img Ubuntu-22.04 --progress
openstack image create --container-format bare --disk-format qcow2 --file noble-server-cloudimg-amd64.img Ubuntu-24.04 --progress

Create a keypair:

Expand All @@ -71,8 +71,8 @@ Create two virtual machines from the image:

.. code-block:: bash

openstack server create --flavor m1.small --image Ubuntu-22.04 --key-name id_rsa --network admin-tenant ubuntu-client-1
openstack server create --flavor m1.small --image Ubuntu-22.04 --key-name id_rsa --network admin-tenant ubuntu-client-2
openstack server create --flavor m1.small --image Ubuntu-24.04 --key-name id_rsa --network admin-tenant ubuntu-client-1
openstack server create --flavor m1.small --image Ubuntu-24.04 --key-name id_rsa --network admin-tenant ubuntu-client-2

Wait until the instances are active. It is worth noting that this process can
take a while, especially if the overcloud is deployed to virtual machines. You
Expand Down
2 changes: 1 addition & 1 deletion doc/source/contributor/testing-ci-automation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ All in one testing
The ``.github/workflows/stackhpc-all-in-one.yml`` reusable workflow accepts
various parameters, and the following are used to create a test matrix for PRs:

- Operating System (Rocky 9, Ubuntu Jammy)
- Operating System (Rocky 9, Ubuntu Noble)
- Neutron plugin (OVS, OVN)
- Upgrade or no upgrade

Expand Down
4 changes: 2 additions & 2 deletions tools/ubuntu-upgrade-infra-vm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ fi

set -x

kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=jammy --limit $1
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=noble --limit $1

kayobe infra vm host configure --limit $1 -e os_release=jammy
kayobe infra vm host configure --limit $1 -e os_release=noble
4 changes: 2 additions & 2 deletions tools/ubuntu-upgrade-overcloud.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ fi

set -x

kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=jammy --limit $1
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=noble --limit $1

kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ovn-fix-chassis-priorities.yml

kayobe overcloud host configure --limit $1 --kolla-limit $1 -e os_release=jammy
kayobe overcloud host configure --limit $1 --kolla-limit $1 -e os_release=noble
2 changes: 1 addition & 1 deletion tools/ubuntu-upgrade-seed-hypervisor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ fi

set -x

kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=jammy --limit seed-hypervisor
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=noble --limit seed-hypervisor

kayobe seed hypervisor host configure
2 changes: 1 addition & 1 deletion tools/ubuntu-upgrade-seed.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ fi

set -x

kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=jammy --limit seed
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=noble --limit seed

kayobe seed host configure
Loading