Skip to content

Commit 4cbf0b2

Browse files
authored
Merge pull request #1384 from stackhpc/2023.1-zed-merge
2023.1: zed merge
2 parents 6293f7f + 26a51aa commit 4cbf0b2

File tree

4 files changed

+33
-19
lines changed

4 files changed

+33
-19
lines changed

.automation

doc/source/configuration/release-train.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. _stackhpc_release_train:
2+
13
======================
24
StackHPC Release Train
35
======================

doc/source/contributor/package-updates.rst

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,20 @@ The following steps describe the process to test the new package and container r
6363
Creating the multinode environments
6464
-----------------------------------
6565

66-
There is a comprehensive guide to setting up a multinode environment with Terraform, found here: https://github.com/stackhpc/terraform-kayobe-multinode. There are some things to note:
66+
The `Multinode deployment workflow <https://github.com/stackhpc/stackhpc-kayobe-config/actions/workflows/stackhpc-multinode.yml>`_ can be used to automatically test changes.
67+
68+
To manually test the changes, there is a comprehensive guide to set up a Multinode environment with Terraform, found here: https://github.com/stackhpc/terraform-kayobe-multinode. There are some things to note:
6769

6870
* OVN is enabled by default, you should override it under ``etc/kayobe/environments/ci-multinode/kolla.yml kolla_enable_ovn: false`` for the OVS multinode environment.
6971

70-
* Remember to set different vxlan_vnis for each.
72+
* Remember to set a different ``vxlan_vni`` for each.
7173

72-
* Before starting any tests, run ``dnf distro-sync`` on each host to ensure you are using the same snapshots as in the release train. You can do this using the following commands:
74+
* Before starting any tests, run ``dnf distro-sync -y`` on each host to ensure you are using the same snapshots as in the release train. Option ``-y`` is used to prevent hosts hang waiting for the confirmation input. You can do this using the following commands:
7375

7476
.. code-block:: console
7577
76-
kayobe seed host command run -b --command "dnf distro-sync"
77-
kayobe overcloud host command run -b --command "dnf distro-sync"
78+
kayobe seed host command run -b --command "dnf distro-sync -y"
79+
kayobe overcloud host command run -b --command "dnf distro-sync -y"
7880
7981
* This may have installed a new kernel version. If so, you will need to reboot the overcloud hosts. You can check the installed kernels and the currently running kernel with the following commands. If the latest listed version is not running, you will need to reboot.
8082

@@ -85,7 +87,7 @@ There is a comprehensive guide to setting up a multinode environment with Terraf
8587
8688
kayobe playbook run --limit seed,overcloud $KAYOBE_CONFIG_PATH/ansible/reboot.yml
8789
88-
* The tempest tests run automatically at the end of deploy-openstack.sh. If you have the time, it is worth fixing any failing tests you can so that there is greater coverage for the package updates. (Also remember to propose these fixes in the relevant repos where applicable.)
90+
* The tempest tests run automatically at the end of the multinode deployment script. If you have the time, it is worth fixing any failing tests you can so that there is greater coverage for the package updates. (Also remember to propose these fixes in the relevant repos where applicable.)
8991

9092
Upgrading host packages
9193
-----------------------
@@ -102,6 +104,7 @@ For Rocky Linux 9, bump the snapshot versions in /etc/yum/repos.d with:
102104

103105
.. code-block:: console
104106
107+
kayobe seed host configure -t dnf
105108
kayobe overcloud host configure -t dnf
106109
107110
Install new packages:
@@ -112,22 +115,32 @@ Install new packages:
112115
113116
Perform a rolling reboot of hosts:
114117

118+
.. note::
119+
In the Multinode environment, the seed-hypervisor cannot access control
120+
plane instances with the Openstack client. To use Openstack client, connect
121+
to the Seed instance via SSH first. For authentication, use scp to copy
122+
``public-openrc.sh`` to the Seed
123+
115124
.. code-block:: console
116125
117-
export ANSIBLE_SERIAL=1
118-
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/reboot.yml --limit controllers
119-
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/reboot.yml --limit compute[0]
126+
# Check your hypervisor hostname
127+
(seed) openstack hypervisor list
128+
129+
# Reboot controller instances and zeroth compute instance
130+
(seed-hypervisor) export ANSIBLE_SERIAL=1
131+
(seed-hypervisor) kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/reboot.yml --limit controllers
132+
(seed-hypervisor) kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/reboot.yml --limit compute[0]
120133
121134
# Test live migration
122-
openstack server create --image cirros --flavor m1.tiny --network external --hypervisor-hostname antelope-pkg-refresh-ovs-compute-02.novalocal --os-compute-api-version 2.74 server1
123-
openstack server migrate --live-migration server1
124-
watch openstack server show server1
135+
(seed) openstack server create --image cirros --flavor m1.tiny --network external --hypervisor-hostname <Your Hypervisor Hostname> --os-compute-api-version 2.74 server1
136+
(seed) openstack server migrate --live-migration server1
137+
(seed) watch openstack server show server1
125138
126-
kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/reboot.yml --limit compute[1]
139+
(seed-hypervisor) kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/reboot.yml --limit compute[1]
127140
128141
# Try and migrate back
129-
openstack server migrate --live-migration server1
130-
watch openstack server show server1
142+
(seed) openstack server migrate --live-migration server1
143+
(seed) watch openstack server show server1
131144
132145
Upgrading containers within a release
133146
-------------------------------------

doc/source/operations/upgrading-openstack.rst

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -459,9 +459,8 @@ To upgrade the Ansible control host:
459459
Syncing Release Train artifacts
460460
-------------------------------
461461

462-
New `StackHPC Release Train <../configuration/release-train>`_ content should
463-
be synced to the local Pulp server. This includes host packages (Deb/RPM) and
464-
container images.
462+
New :ref:`stackhpc_release_train` content should be synced to the local Pulp
463+
server. This includes host packages (Deb/RPM) and container images.
465464

466465
.. _sync-rt-package-repos:
467466

0 commit comments

Comments
 (0)