docs: Various improvements to the ci-aio and ci-builder docs

markgoddard · markgoddard · commit 1086e6f98fb8 · 2024-06-25T15:46:48.000+01:00
diff --git a/doc/source/contributor/environments/ci-aio.rst b/doc/source/contributor/environments/ci-aio.rst
@@ -14,12 +14,11 @@ Prerequisites
 =============
 
 * a Rocky Linux 9 or Ubuntu Jammy 22.04 host
-* access to the Test Pulp server on SMS lab
 
 Automated Setup
 ===============
 
-Access the host via SSH.
+Access the host via SSH. You may wish to start a ``tmux`` session.
 
 Download the setup script:
 
@@ -67,12 +66,29 @@ Host Configuration
 
 Access the host via SSH.
 
-Install package dependencies when on Ubuntu:
+If using an LVM-based image, extend the ``lv_home`` and ``lv_tmp`` logical
+volumes.
+
+.. parsed-literal::
+
+   sudo pvresize $(sudo pvs --noheadings | head -n 1 | awk '{print $1}')
+   sudo lvextend -L 4G /dev/rootvg/lv_home -r
+   sudo lvextend -L 4G /dev/rootvg/lv_tmp -r
+
+Install package dependencies.
+
+On Rocky Linux:
+
+.. parsed-literal::
+
+   sudo dnf install -y git
+
+On Ubuntu:
 
 .. parsed-literal::
 
    sudo apt update
-   sudo apt install -y python3-virtualenv
+   sudo apt install -y gcc git libffi-dev python3-dev python-is-python3 python3-venv
 
 Clone the Kayobe and Kayobe configuration repositories (this one):
 
@@ -92,7 +108,7 @@ Create a virtual environment and install Kayobe:
    cd
    mkdir -p venvs
    pushd venvs
-   virtualenv kayobe
+   python3 -m venv kayobe
    source kayobe/bin/activate
    pip install -U pip
    pip install ../src/kayobe
@@ -109,6 +125,12 @@ Add initial network configuration:
    sudo ip l set dummy1 up
    sudo ip l set dummy1 master breth1
 
+On Ubuntu systems, persist the running network configuration.
+
+.. parsed-literal::
+
+   sudo cp /run/systemd/network/* /etc/systemd/network
+
 Configuration
 =============
 
@@ -143,6 +165,18 @@ Ansible control host.
 Deployment
 ----------
 
+If using an LVM-based image, grow the root volume group.
+
+.. parsed-literal::
+
+   kayobe playbook run etc/kayobe/ansible/growroot.yml
+
+On Ubuntu systems, purge the command-not-found package.
+
+.. parsed-literal::
+
+   kayobe playbook run etc/kayobe/ansible/purge-command-not-found.yml
+
 Next, configure the host OS & services.
 
 .. parsed-literal::
diff --git a/doc/source/contributor/environments/ci-builder.rst b/doc/source/contributor/environments/ci-builder.rst
@@ -3,40 +3,47 @@ ci-builder
 ==========
 
 The ``ci-builder`` Kayobe environment is used to build Kolla container images.
-Images are built using package repositories in the StackHPC development Pulp
-service, and pushed there once built.
-
-.. warning::
-
-    This guide was written for the Yoga release and has not been validated for
-    Antelope. Proceed with caution.
+Images are built using package repositories in the StackHPC Ark Pulp service,
+and pushed there once built.
 
+In general it is preferable to use the `container image build CI workflow
+<https://github.com/stackhpc/stackhpc-kayobe-config/actions/workflows/stackhpc-container-image-build.yml>`_
+to build container images, but this manual approach may be useful in some
+cases.
 
 Prerequisites
 =============
 
 * a Rocky Linux 9 or Ubuntu Jammy 22.04 host
-* access to the Test Pulp server on SMS lab
 
 Setup
 =====
 
-Access the host via SSH.
+Access the host via SSH. You may wish to start a ``tmux`` session.
+
+If using an LVM-based image, extend the ``lv_home`` and ``lv_tmp`` logical
+volumes.
+
+.. parsed-literal::
+
+   sudo pvresize $(sudo pvs --noheadings | head -n 1 | awk '{print $1}')
+   sudo lvextend -L 4G /dev/rootvg/lv_home -r
+   sudo lvextend -L 4G /dev/rootvg/lv_tmp -r
 
 Install package dependencies.
 
 On Rocky Linux:
 
 .. parsed-literal::
 
-   sudo dnf install -y python3-virtualenv
+   sudo dnf install -y git
 
 On Ubuntu:
 
 .. parsed-literal::
 
    sudo apt update
-   sudo apt install -y python3-virtualenv
+   sudo apt install -y gcc git libffi-dev python3-dev python-is-python3 python3-venv
 
 Clone the Kayobe and Kayobe configuration repositories (this one):
 
@@ -56,7 +63,7 @@ Create a virtual environment and install Kayobe:
    cd
    mkdir -p venvs
    pushd venvs
-   virtualenv kayobe
+   python3 -m venv kayobe
    source kayobe/bin/activate
    pip install -U pip
    pip install ../src/kayobe
@@ -73,6 +80,12 @@ Add initial network configuration:
    sudo ip l set dummy1 up
    sudo ip l set dummy1 master breth1
 
+On Ubuntu systems, persist the running network configuration.
+
+.. parsed-literal::
+
+   sudo cp /run/systemd/network/* /etc/systemd/network
+
 Installation
 ============
 
@@ -95,6 +108,21 @@ Ansible control host.
 Deployment
 ==========
 
+If using an LVM-based image, uncomment the ``seed_lvm_groups`` variable in
+``etc/kayobe/environments/ci-builder/seed.yml``.
+
+If using an LVM-based image, grow the root volume group.
+
+.. parsed-literal::
+
+   kayobe playbook run etc/kayobe/ansible/growroot.yml -e growroot_group=seed
+
+On Ubuntu systems, purge the command-not-found package.
+
+.. parsed-literal::
+
+   kayobe playbook run etc/kayobe/ansible/purge-command-not-found.yml
+
 Next, configure the host OS & services.
 
 .. parsed-literal::
@@ -142,8 +170,17 @@ At this point you are ready to build and push some container images.
 If using an :ref:`authenticating Pulp proxy <authenticating-pulp-proxy>`,
 append ``-e stackhpc_repo_mirror_auth_proxy_enabled=true`` to these commands.
 
-The container images are tagged as |current_release|-<datetime>.
+The container images are tagged as |current_release|-<distribution>-<datetime>.
+Check ``tag`` in ``/opt/kayobe/etc/kolla/kolla-build.conf`` or run ``docker
+image ls`` to see the tag of the new images.
+
+To build images for a different base distribution, set ``-e
+kolla_base_distro=<distro>``.
+
+To build images using a specific tag, set ``-e kolla_tag=<tag>``.
+
+Using the new images
+====================
 
 To use the new images, edit
-``~/src/kayobe-config/etc/kayobe/kolla.yml`` to set the above
-tag as the value of the ``kolla_openstack_release`` variable.
+``~/src/kayobe-config/etc/kayobe/kolla-image-tags.yml`` to reference the tag.
diff --git a/etc/kayobe/environments/ci-aio/automated-setup.sh b/etc/kayobe/environments/ci-aio/automated-setup.sh
@@ -24,10 +24,6 @@ elif $KAYOBE_AIO_LVM; then
    exit 1
 fi
 
-cat << EOF | sudo tee -a /etc/hosts
-10.205.3.187 pulp-server pulp-server.internal.sms-cloud
-EOF
-
 if type dnf; then
     sudo dnf -y install git
 else
diff --git a/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/lvm.yml b/etc/kayobe/environments/ci-builder/inventory/group_vars/seed/lvm.yml
@@ -0,0 +1,34 @@
+---
+# List of extra LVs to include in the rootvg VG.
+stackhpc_lvm_group_rootvg_lvs_extra:
+  - "{{ stackhpc_lvm_lv_docker }}"
+
+###############################################################################
+# StackHPC LVM Logical Volume (LV) configuration.
+
+# StackHPC LVM lv_swap LV size.
+stackhpc_lvm_lv_swap_size: 500m
+
+# StackHPC LVM lv_root LV size.
+stackhpc_lvm_lv_root_size: 2g
+
+# StackHPC LVM lv_tmp LV size.
+stackhpc_lvm_lv_tmp_size: 2g
+
+# StackHPC LVM lv_var LV size.
+stackhpc_lvm_lv_var_size: 2g
+
+# StackHPC LVM lv_var_tmp LV size.
+stackhpc_lvm_lv_var_tmp_size: 2g
+
+# StackHPC LVM lv_log LV size.
+stackhpc_lvm_lv_log_size: 2g
+
+# StackHPC LVM lv_audit LV size.
+stackhpc_lvm_lv_audit_size: 250m
+
+# StackHPC LVM lv_home LV size.
+stackhpc_lvm_lv_home_size: 2g
+
+# StackHPC LVM lv_docker LV size.
+stackhpc_lvm_lv_docker_size: 95%FREE
diff --git a/etc/kayobe/environments/ci-builder/seed.yml b/etc/kayobe/environments/ci-builder/seed.yml
@@ -5,3 +5,9 @@
 # User with which to access the seed via SSH during bootstrap, in order
 # to setup the Kayobe user account. Default is {{ os_distribution }}.
 seed_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
+
+# Uncomment this if using an LVM-based image.
+# Seed lvm configuration. See inventory/group_vars/seed/lvm.yml
+# for the exact configuration.
+# seed_lvm_groups:
+#   - "{{ stackhpc_lvm_group_rootvg }}"
