From a3a8c101f9ef90bee23a9ea44402d1362b9e5d91 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 1 Mar 2024 11:42:22 +0000
Subject: [PATCH 1/2] Replace references to CentOS with Rocky Linux

---
 doc/source/contributor/environments/aufn-ceph.rst             | 2 +-
 doc/source/contributor/environments/ci-builder.rst            | 2 +-
 doc/source/operations/tempest.rst                             | 4 ++--
 .../environments/aufn-ceph/configure-local-networking.sh      | 2 +-
 etc/kayobe/environments/aufn-ceph/seed-hypervisor.yml         | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/source/contributor/environments/aufn-ceph.rst b/doc/source/contributor/environments/aufn-ceph.rst
index 5fe07b86f..9578efb48 100644
--- a/doc/source/contributor/environments/aufn-ceph.rst
+++ b/doc/source/contributor/environments/aufn-ceph.rst
@@ -14,7 +14,7 @@ This environment creates a Universe-from-nothing_-style deployment of Kayobe con
 Prerequisites
 =============
 
-* a baremetal node with at least 64GB of RAM running CentOS Stream 8 (or Ubuntu)
+* 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
 
diff --git a/doc/source/contributor/environments/ci-builder.rst b/doc/source/contributor/environments/ci-builder.rst
index f0a6f0ee9..5cbc3371e 100644
--- a/doc/source/contributor/environments/ci-builder.rst
+++ b/doc/source/contributor/environments/ci-builder.rst
@@ -25,7 +25,7 @@ Access the host via SSH.
 
 Install package dependencies.
 
-On CentOS:
+On Rocky Linux:
 
 .. parsed-literal::
 
diff --git a/doc/source/operations/tempest.rst b/doc/source/operations/tempest.rst
index a3bd4ac1c..ea8503626 100644
--- a/doc/source/operations/tempest.rst
+++ b/doc/source/operations/tempest.rst
@@ -65,7 +65,7 @@ To install Docker on Ubuntu:
     sudo apt-get update
     sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
 
-Installing Docker on CentOS/Rocky:
+Installing Docker on Rocky:
 
 .. code-block:: bash
 
@@ -99,7 +99,7 @@ Build a Kayobe automation image:
 
     git submodule init
     git submodule update
-    # If running on Ubuntu, the fact cache can confuse Kayobe in the CentOS-based container
+    # If running on Ubuntu, the fact cache can confuse Kayobe in the Rocky-based container
     mv etc/kayobe/facts{,-old}
     sudo DOCKER_BUILDKIT=1 docker build --file .automation/docker/kayobe/Dockerfile --tag kayobe:latest .
 
diff --git a/etc/kayobe/environments/aufn-ceph/configure-local-networking.sh b/etc/kayobe/environments/aufn-ceph/configure-local-networking.sh
index ab3602d2a..c22bbd518 100755
--- a/etc/kayobe/environments/aufn-ceph/configure-local-networking.sh
+++ b/etc/kayobe/environments/aufn-ceph/configure-local-networking.sh
@@ -43,7 +43,7 @@ if ! sudo ip l show brcloud >/dev/null 2>&1; then
     sudo ip l set brcloud up
 fi
 
-# On CentOS 8, bridges without a port are DOWN, which causes network
+# On Rocky Linux, bridges without a port are DOWN, which causes network
 # configuration to fail. Add a dummy interface and plug it into the bridge.
 for i in mgmt prov cloud; do
     if ! sudo ip l show dummy-$i >/dev/null 2>&1; then
diff --git a/etc/kayobe/environments/aufn-ceph/seed-hypervisor.yml b/etc/kayobe/environments/aufn-ceph/seed-hypervisor.yml
index 6a1b7ffdf..2f288f030 100644
--- a/etc/kayobe/environments/aufn-ceph/seed-hypervisor.yml
+++ b/etc/kayobe/environments/aufn-ceph/seed-hypervisor.yml
@@ -10,5 +10,5 @@ seed_hypervisor_extra_network_interfaces:
   - "{{ public_net_name }}"
   - "{{ external_net_names[0] }}"
 
-# Workaround change to cloud-user default login name on CentOS-Stream8
+# Workaround change to cloud-user default login name on Rocky Linux
 seed_hypervisor_bootstrap_user: "{{ lookup('env', 'USER') }}"

From b83cec2ba3cd27ccf6467da1cb34194af4cf9c68 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 1 Mar 2024 11:43:22 +0000
Subject: [PATCH 2/2] docs: Add BASE_IMAGE build-arg for kayobe image build

A Rocky Linux 9 base image is required for Zed onwards.
---
 doc/source/operations/tempest.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/source/operations/tempest.rst b/doc/source/operations/tempest.rst
index ea8503626..a5991097c 100644
--- a/doc/source/operations/tempest.rst
+++ b/doc/source/operations/tempest.rst
@@ -101,7 +101,7 @@ Build a Kayobe automation image:
     git submodule update
     # If running on Ubuntu, the fact cache can confuse Kayobe in the Rocky-based container
     mv etc/kayobe/facts{,-old}
-    sudo DOCKER_BUILDKIT=1 docker build --file .automation/docker/kayobe/Dockerfile --tag kayobe:latest .
+    sudo DOCKER_BUILDKIT=1 docker build --build-arg BASE_IMAGE=rockylinux:9 --file .automation/docker/kayobe/Dockerfile --tag kayobe:latest .
 
 Configuration
 =============