Skip to content

Commit 4fda999

Browse files
Alex-WelshAlex-Welsh
committed
Correct more references to CS8/Focal
1 parent 2d8b504 commit 4fda999

File tree

14 files changed

+45
-45
lines changed

14 files changed

+45
-45
lines changed

‎doc/source/contributor/environments/aufn-ceph.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,15 @@ This environment creates a Universe-from-nothing_-style deployment of Kayobe con
66

77
.. _Universe-from-nothing: https://github.com/stackhpc/a-universe-from-nothing
88

9+
.. warning::
10+
11+
This guide was written for the Yoga release and has not been validated for
12+
Zed. Proceed with caution.
13+
914
Prerequisites
1015
=============
1116

12-
* a baremetal node with at least 64GB of RAM running CentOS Stream 8 (or Ubuntu)
17+
* a baremetal node with at least 64GB of RAM running Rocky Linux 9 (or Ubuntu Jammy 22.04)
1318

1419
* access to the test pulp server on SMS lab
1520

‎doc/source/contributor/environments/ci-builder.rst

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ The ``ci-builder`` Kayobe environment is used to build Kolla container images.
66
Images are built using package repositories in the StackHPC development Pulp
77
service, and pushed there once built.
88

9+
.. warning::
10+
11+
This guide was written for the Yoga release and has not been validated for
12+
Zed. Proceed with caution.
13+
914
Prerequisites
1015
=============
1116

@@ -19,12 +24,6 @@ Access the host via SSH.
1924

2025
Install package dependencies.
2126

22-
On CentOS:
23-
24-
.. parsed-literal::
25-
26-
sudo dnf install -y python3-virtualenv
27-
2827
On Ubuntu:
2928

3029
.. parsed-literal::

‎doc/source/contributor/environments/ci-multinode.rst

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ Multinode Test Environment
44

55
.. warning::
66

7-
The initial setup guide here is designed for the Yoga release of OpenStack. Proceed with caution.
7+
This guide was written for the Yoga release and has not been validated for
8+
Zed. Proceed with caution.
89

910
Set up hosts
1011
============
11-
1. Create four baremetal instances with a centos 8 stream LVM image, and a
12-
Centos 8 stream vm
13-
2. SSH into each baremetal and run ``sudo chown -R centos:.`` in the home
12+
1. Create four baremetal instances with a Rocky Linux 9 LVM image, and a
13+
Rocky Linux 9 vm.
14+
2. SSH into each baremetal and run ``sudo chown -R cloud-user:.`` in the home
1415
directory, then add the lines::
1516

1617
10.0.0.34 pelican pelican.service.compute.sms-lab.cloud

‎etc/kayobe/environments/aufn-ceph/globals.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
###############################################################################
55
# OS distribution.
66

7-
# OS distribution name. Valid options are "centos", "ubuntu". Default is
8-
# "centos".
7+
# OS distribution name. Valid options are "rocky", "ubuntu". Default is
8+
# "rocky".
99
os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
1010

11-
# OS release. Valid options are "8-stream" when os_distribution is "centos", or
12-
# "focal" when os_distribution is "ubuntu".
11+
# OS release. Valid options are "9" when os_distribution is "rocky", or
12+
# "jammy" when os_distribution is "ubuntu".
1313
os_release: >-
1414
{{ (lookup('pipe', '. /etc/os-release && echo $VERSION_CODENAME') | trim) if os_distribution == 'ubuntu' else
15-
(lookup('pipe', '. /etc/os-release && echo $VERSION_ID') | trim | split('.') | first) if os_distribution == 'rocky' else
16-
'stream-8' }}
15+
(lookup('pipe', '. /etc/os-release && echo $VERSION_ID') | trim | split('.') | first) if os_distribution == 'rocky' }}

‎etc/kayobe/environments/aufn-ceph/kolla/config/bifrost/bifrost.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
create_ipa_image: false
55
download_ipa: true
66

7-
# Use a locally hosted CentOS8 cloud image.
7+
# Use a locally hosted cloud image.
88
use_cirros: true
99
{% if os_distribution == 'ubuntu' %}
10-
cirros_deploy_image_upstream_url: "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img"
11-
{% elif os_distribution == 'rocky' and os_release == '9' %}
12-
cirros_deploy_image_upstream_url: "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
10+
cirros_deploy_image_upstream_url: "https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"
1311
{% else %}
14-
cirros_deploy_image_upstream_url: "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20220913.0.x86_64.qcow2"
12+
cirros_deploy_image_upstream_url: "https://dl.rockylinux.org/pub/rocky/9/images/x86_64/Rocky-9-GenericCloud.latest.x86_64.qcow2"
1513
{% endif %}

‎etc/kayobe/environments/ci-aio/automated-setup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ if [ sudo vgdisplay | grep -q lvm2 ]; then
1212
fi
1313

1414
BASE_PATH=~
15-
KAYOBE_BRANCH=stackhpc/yoga
16-
KAYOBE_CONFIG_BRANCH=stackhpc/yoga
15+
KAYOBE_BRANCH=stackhpc/zed
16+
KAYOBE_CONFIG_BRANCH=stackhpc/zed
1717

1818
if [[ ! -f $BASE_PATH/vault-pw ]]; then
1919
echo "Vault password file not found at $BASE_PATH/vault-pw"

‎etc/kayobe/environments/ci-aio/globals.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,15 @@
4545
###############################################################################
4646
# OS distribution.
4747

48-
# OS distribution name. Valid options are "centos", "ubuntu". Default is
49-
# "centos".
48+
# OS distribution name. Valid options are "rocky", "ubuntu". Default is
49+
# "rocky".
5050
os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
5151

52-
# OS release. Valid options are "8-stream" when os_distribution is "centos", or
53-
# "focal" when os_distribution is "ubuntu".
52+
# OS release. Valid options are "9" when os_distribution is "rocky", or
53+
# "jammy" when os_distribution is "ubuntu".
5454
os_release: >-
5555
{{ (lookup('pipe', '. /etc/os-release && echo $VERSION_CODENAME') | trim) if os_distribution == 'ubuntu' else
56-
(lookup('pipe', '. /etc/os-release && echo $VERSION_ID') | trim | split('.') | first) if os_distribution == 'rocky' else
57-
'stream-8' }}
56+
(lookup('pipe', '. /etc/os-release && echo $VERSION_ID') | trim | split('.') | first) if os_distribution == 'rocky' }}
5857
5958
###############################################################################
6059

‎etc/kayobe/environments/ci-builder/globals.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
###############################################################################
55
# OS distribution.
66

7-
# OS distribution name. Valid options are "centos", "ubuntu". Default is
8-
# "centos".
7+
# OS distribution name. Valid options are "rocky", "ubuntu". Default is
8+
# "rocky".
99
os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
1010

1111
###############################################################################

‎etc/kayobe/environments/ci-multinode/globals.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,16 +45,16 @@
4545
###############################################################################
4646
# OS distribution.
4747

48-
# OS distribution name. Valid options are "centos", "ubuntu". Default is
49-
# "centos".
48+
# OS distribution name. Valid options are "rocky", "ubuntu". Default is
49+
# "rocky".
5050
os_distribution: "{{ lookup('pipe', '. /etc/os-release && echo $ID') | trim }}"
5151

52-
# OS release. Valid options are "8-stream" when os_distribution is "centos", or
53-
# "focal" when os_distribution is "ubuntu".
52+
# OS release. Valid options are "9" when os_distribution is "rocky", or
53+
# "jammy" when os_distribution is "ubuntu".
5454
os_release: >-
5555
{{ (lookup('pipe', '. /etc/os-release && echo $VERSION_CODENAME') | trim) if os_distribution == 'ubuntu' else
56-
(lookup('pipe', '. /etc/os-release && echo $VERSION_ID') | trim | split('.') | first) if os_distribution == 'rocky' else
57-
'stream-8' }}
56+
(lookup('pipe', '. /etc/os-release && echo $VERSION_ID') | trim | split('.') | first) if os_distribution == 'rocky' }}
57+
5858
###############################################################################
5959
# Hashicorp vault, Barbican, and TLS configuration
6060

‎etc/kayobe/environments/ci-multinode/kolla/globals-tls-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Copy the self-signed CA into the kolla containers
77
kolla_copy_ca_into_containers: "yes"
88
# Use the following trust store within the container
9-
openstack_cacert: "{{ '/etc/pki/tls/certs/ca-bundle.crt' if os_distribution in ['centos', 'rocky'] else '/etc/ssl/certs/ca-certificates.crt' }}"
9+
openstack_cacert: "{{ '/etc/pki/tls/certs/ca-bundle.crt' if os_distribution == 'rocky' else '/etc/ssl/certs/ca-certificates.crt' }}"
1010

1111
# Backend TLS config
1212
# Enable backend TLS

‎etc/kayobe/overcloud-dib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# Whether to build host disk images with DIB directly instead of through
88
# Bifrost. Setting it to true disables Bifrost image build and allows images to
99
# be built with the `kayobe overcloud host image build` command. Default value
10-
# is {{ os_distribution == 'rocky' }}. This will change in a future release.
10+
# is true.
1111
overcloud_dib_build_host_images: "{{ not stackhpc_download_overcloud_host_images | bool }}"
1212

1313
# List of additional host packages to install.

‎etc/kayobe/stackhpc-overcloud-dib.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ stackhpc_overcloud_dib_name: "deployment_image"
2323
stackhpc_overcloud_dib_elements:
2424
- "{{ os_distribution }}-{% if os_distribution == 'rocky' %}container{% else %}minimal{% endif %}"
2525
- "cloud-init-datasources"
26-
- "{% if os_distribution in ['centos', 'rocky'] %}disable-selinux{% endif %}"
26+
- "{% if os_distribution == 'rocky' %}disable-selinux{% endif %}"
2727
- "enable-serial-console"
2828
- "{% if kayobe_environment == 'ci-builder' %}etc-hosts{% endif %}"
2929
- "vm"
3030
- "block-device-efi"
3131
- "cloud-init"
32-
- "{% if os_distribution in ['centos', 'rocky'] %}dracut-regenerate{% endif %}"
32+
- "{% if os_distribution == 'rocky' %}dracut-regenerate{% endif %}"
3333
- "{% if os_distribution == 'ubuntu' %}lvm{% endif %}"
3434
- "openssh-server"
3535
- "{% if os_distribution == 'ubuntu' %}sudoers{% endif %}"
@@ -71,7 +71,6 @@ stackhpc_overcloud_dib_packages:
7171
- "{% if os_distribution == 'ubuntu' %}iputils-ping{% endif %}"
7272
- "{% if os_distribution == 'ubuntu' %}curl{% endif %}"
7373
- "{% if os_distribution == 'ubuntu' %}apt-utils{% endif %}"
74-
- "{% if os_distribution == 'centos' %}openssh-clients{% endif %}"
7574
- "{% if os_distribution == 'rocky' %}NetworkManager-config-server{% endif %}"
7675

7776
# StackHPC overcloud DIB image block device configuration.

‎terraform/aio/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Generate Terraform variables:
8484
cat << EOF > terraform.tfvars
8585
ssh_public_key = "id_rsa.pub"
8686
aio_vm_name = "kayobe-aio"
87-
aio_vm_image = "CentOS-stream8"
87+
aio_vm_image = "Rocky9"
8888
aio_vm_flavor = "general.v1.medium"
8989
aio_vm_network = "stackhpc-ipv4-geneve"
9090
aio_vm_subnet = "stackhpc-ipv4-geneve-subnet"

‎terraform/aio/vm.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ variable "aio_vm_name" {
1313

1414
variable "aio_vm_image" {
1515
type = string
16-
default = "CentOS-stream8"
16+
default = "Rocky9"
1717
}
1818

1919
variable "aio_vm_interface" {

0 commit comments

Comments
 (0)