Merge pull request #653 from stackhpc/antelope-bits

Small Antelope fixes

Author: markgoddard

doc/source/contributor/environments/ci-aio.rst

@@ -10,6 +10,11 @@ automates the manual setup steps below, and is recommended for most users.
 The manual setup steps are provided for reference, and for users who wish to
 make changes to the setup process.
 
+.. warning::
+
+    This guide was written for the Yoga release and has not been validated for
+    Antelope. Proceed with caution.
+
 Prerequisites
 =============
 

etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh

@@ -10,8 +10,8 @@
 set -eu
 
 BASE_PATH=~
-KAYOBE_BRANCH=stackhpc/yoga
-KAYOBE_CONFIG_BRANCH=stackhpc/yoga
+KAYOBE_BRANCH=stackhpc/2023.1
+KAYOBE_CONFIG_BRANCH=stackhpc/2023.1
 KAYOBE_ENVIRONMENT=aufn-ceph
 
 PELICAN_HOST="10.0.0.34 pelican pelican.service.compute.sms-lab.cloud"
@@ -25,10 +25,10 @@ EOF
 
 # Install git and tmux.
 if $(which dnf 2>/dev/null >/dev/null); then
-    sudo dnf -y install git tmux python3-virtualenv
+    sudo dnf -y install git tmux
 else
     sudo apt update
-    sudo apt -y install git tmux gcc libffi-dev python3-dev python-is-python3 python3-virtualenv
+    sudo apt -y install git tmux gcc libffi-dev python3-dev python-is-python3
 fi
 
 # Disable the firewall.
@@ -56,7 +56,7 @@ popd
 mkdir -p venvs
 pushd venvs
 if [[ ! -d kayobe ]]; then
-    virtualenv kayobe
+    python3 -m venv kayobe
 fi
 # NOTE: Virtualenv's activate and deactivate scripts reference an
 # unbound variable. 

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

@@ -12,8 +12,8 @@ if [ sudo vgdisplay | grep -q lvm2 ]; then
 fi
 
 BASE_PATH=~
-KAYOBE_BRANCH=stackhpc/zed
-KAYOBE_CONFIG_BRANCH=stackhpc/zed
+KAYOBE_BRANCH=stackhpc/2023.1
+KAYOBE_CONFIG_BRANCH=stackhpc/2023.1
 
 if [[ ! -f $BASE_PATH/vault-pw ]]; then
     echo "Vault password file not found at $BASE_PATH/vault-pw"

etc/kayobe/stackhpc.yml

@@ -47,9 +47,9 @@ stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}"
 
-# CentOS Stream 9 - OpenStack Zed
-stackhpc_repo_centos_stream_9_openstack_zed_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/cloud/x86_64/openstack-zed/{{ stackhpc_repo_centos_stream_9_openstack_zed_version }}"
-stackhpc_repo_centos_stream_9_openstack_zed_version: "{{ stackhpc_repo_distribution }}"
+# CentOS Stream 9 - OpenStack Antelope
+stackhpc_repo_centos_stream_9_openstack_antelope_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/cloud/x86_64/openstack-antelope/{{ stackhpc_repo_centos_stream_9_openstack_antelope_version }}"
+stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_repo_distribution }}"
 
 # CentOS Stream 9 - OpsTools - collectd
 stackhpc_repo_centos_stream_9_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_stream_9_opstools_version }}"