Skip to content

Commit b16de99

Browse files
committed
sed s/caracal/master
1 parent 8fa8e96 commit b16de99

File tree

12 files changed

+22
-75
lines changed

12 files changed

+22
-75
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This environment creates a Universe-from-nothing_-style deployment of Kayobe con
99
.. warning::
1010

1111
This guide was written for the Yoga release and has not been validated for
12-
Caracal. Proceed with caution.
12+
Master. Proceed with caution.
1313

1414
Prerequisites
1515
=============

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ and pushed there once built.
99
.. warning::
1010

1111
This guide was written for the Yoga release and has not been validated for
12-
Caracal. Proceed with caution.
12+
Master. Proceed with caution.
1313

1414
In general it is preferable to use the `container image build CI workflow
1515
<https://github.com/stackhpc/stackhpc-kayobe-config/actions/workflows/stackhpc-container-image-build.yml>`_

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Multinode Test Environment
55
.. warning::
66

77
This guide was written for the Yoga release and has not been validated for
8-
Caracal. Proceed with caution.
8+
Master. Proceed with caution.
99

1010
The ``ci-multinode`` environment provides a Kayobe configuration for multi-node
1111
clouds to be used for test and development purposes. It is designed to be used

doc/source/contributor/package-updates.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ Upgrading OpenStack to the next release in a multinode environment
165165
.. warning::
166166

167167
This guide was written for the Wallaby release and has not been validated
168-
for Caracal. Proceed with caution.
168+
for master. Proceed with caution.
169169

170170
As this is not a full production system, only a reduced number of steps need to be followed to upgrade to a new release. Below describes these steps, with ``stackhpc/wallaby`` as the starting branch:
171171

doc/source/operations/upgrading-openstack.rst

Lines changed: 6 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Known issues
4848
Security baseline
4949
=================
5050

51-
As part of the Caracal release we are looking to improve the security
51+
As part of the Master release we are looking to improve the security
5252
baseline of StackHPC OpenStack deployments. If any of the following have not
5353
been done, they should be completed before the upgrade begins.
5454

@@ -84,61 +84,13 @@ suggestions:
8484
* Update the deployment to use the latest |previous_release| images and
8585
configuration.
8686

87-
RabbitMQ SLURP upgrade
87+
Ubuntu Noble migration
8888
----------------------
8989

90-
.. note::
91-
The upgrade is reliant on recent changes. Make sure you have updated to
92-
the latest version of kolla ansible and deployed the latest kolla containers
93-
before proceeding.
94-
95-
Because this is a SLURP upgrade, RabbitMQ must be upgraded manually from 3.11,
96-
to 3.12, then to 3.13 on Antelope before the Caracal upgrade. This upgrade
97-
should not cause an API outage (though it should still be considered "at
98-
risk").
99-
100-
Some errors have been observed in testing when the upgrades are performed
101-
back-to-back. A 200s delay eliminates this issue. On particularly large or slow
102-
deployments, consider increasing this timeout.
103-
104-
Additionally errors have been observed at sites with OVS networking where after
105-
the upgrade, tenant networking is broken and requires a reset of RabbitMQ. This
106-
can be done by running the rabbitmq-reset playbook.
107-
108-
.. code-block:: bash
109-
110-
kayobe overcloud service configuration generate --node-config-dir /tmp/ignore -kt none
111-
kayobe kolla ansible run "rabbitmq-upgrade 3.12"
112-
sleep 200
113-
kayobe kolla ansible run "rabbitmq-upgrade 3.13"
114-
115-
RabbitMQ quorum queues
116-
----------------------
117-
118-
In Caracal, quorum queues are enabled by default for RabbitMQ. This is
119-
different to Antelope which used HA queues. Before upgrading to Caracal, it is
120-
strongly recommended that you migrate from HA to quorum queues. The migration
121-
is automated using a script.
122-
123-
.. warning::
124-
This migration will stop all services using RabbitMQ and cause an
125-
extended API outage while queues are migrated. It should only be
126-
performed in a pre-agreed maintenance window.
127-
128-
Set the following variables in your kolla globals file (i.e.
129-
``$KAYOBE_CONFIG_PATH/kolla/globals.yml`` or
130-
``$KAYOBE_CONFIG_PATH/environments/$KAYOBE_ENVIRONMENT/kolla/globals.yml``):
131-
132-
.. code-block:: yaml
133-
134-
om_enable_rabbitmq_high_availability: false
135-
om_enable_rabbitmq_quorum_queues: true
136-
137-
Then execute the migration script:
138-
139-
.. code-block:: bash
140-
141-
$KAYOBE_CONFIG_PATH/../../tools/rabbitmq-quorum-migration.sh
90+
Ubuntu Jammy support has been removed from the 2025.1 release onwards. Hosts
91+
must be migrated to Ubuntu 24.04 before upgrading OpenStack services. The
92+
upgrade process is currently a work in progress.
93+
.. TODO: Add link to another page describing how to migrate
14294
14395
Preparation
14496
===========

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble
3030
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
3131
stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
3232
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
33-
stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
3433
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
3534
stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
3635
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble
5656
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
5757
stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
5858
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
59-
stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
6059
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
6160
stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
6261
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

etc/kayobe/environments/ci-multinode/stackhpc-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble
3030
stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
3131
stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
3232
stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
33-
stackhpc_repo_centos_stream_9_openstack_caracal_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version }}"
3433
stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
3534
stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
3635
stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

etc/kayobe/kolla.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,12 @@ stackhpc_rocky_9_additional_repos:
183183
- url: "{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_url }}"
184184
file: "CentOS-NFV-OpenvSwitch.repo"
185185
tag: "centos-nfv-openvswitch"
186-
- url: "{{ stackhpc_repo_centos_stream_9_openstack_caracal_url }}"
187-
file: "CentOS-OpenStack-caracal.repo"
188-
tag: "centos-openstack-caracal"
186+
- url: "{{ stackhpc_repo_delorian_master_testing_url }}"
187+
file: "DeLorean.repo"
188+
tag: "delorean-master-testing"
189+
- url: "{{ stackhpc_repo_delorian_master_build_deps_url }}"
190+
file: "DeLorean.repo"
191+
tag: "delorean-master-build-deps"
189192
- url: "{{ stackhpc_repo_centos_stream_9_opstools_url }}"
190193
file: "CentOS-OpsTools.repo"
191194
tag: "centos-opstools"

etc/kayobe/pulp-repo-versions.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
# https://github.com/stackhpc/stackhpc-release-train/actions/workflows/package-update-kayobe.yml
44
stackhpc_pulp_repo_centos_stream_9_docker_version: 20241210T000909
55
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20241214T012909
6-
stackhpc_pulp_repo_centos_stream_9_openstack_caracal_version: 20241212T022636
76
stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
87
stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version: 20240923T233036
98
stackhpc_pulp_repo_docker_ce_ubuntu_noble_version: 20241218T154614

0 commit comments

Comments
 (0)