Skip to content

Commit 0581563

Browse files
authored
Merge branch 'stackhpc/2023.1' into bump-neutron
2 parents 086c0a4 + 06df161 commit 0581563

File tree

7 files changed

+23
-12
lines changed

7 files changed

+23
-12
lines changed

doc/source/configuration/cephadm.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,8 +208,8 @@ Pools
208208
~~~~~
209209

210210
The following example pools should be sufficient to work with the
211-
default `external Ceph
212-
configuration <https://docs.openstack.org/kolla-ansible/latest/reference/storage/external-ceph-guide.html>`__
211+
default :kolla-ansible-doc:`external Ceph
212+
configuration <reference/storage/external-ceph-guide.html>`
213213
for Cinder, Cinder backup, Glance, and Nova in Kolla Ansible.
214214

215215
.. code:: yaml
@@ -236,8 +236,8 @@ Keys
236236
~~~~
237237

238238
The following example keys should be sufficient to work with the default
239-
`external Ceph
240-
configuration <https://docs.openstack.org/kolla-ansible/latest/reference/storage/external-ceph-guide.html>`__
239+
:kolla-ansible-doc:`external Ceph
240+
configuration <reference/storage/external-ceph-guide.html>`
241241
for Cinder, Cinder backup, Glance, and Nova in Kolla Ansible.
242242

243243
.. code:: yaml
@@ -353,7 +353,7 @@ RADOS Gateways
353353

354354
RADOS Gateway integration is described in the :kolla-ansible-doc:`Kolla Ansible
355355
documentation
356-
<https://docs.openstack.org/kolla-ansible/latest/reference/storage/external-ceph-guide.html#radosgw>`.
356+
<reference/storage/external-ceph-guide.html#radosgw>`.
357357

358358
RADOS Gateways (RGWs) are defined with the following:
359359

doc/source/configuration/ci-cd.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ Runner Deployment
118118
The repository permissions for a fine-grained personal access token should be; :code:`Actions: R/W, Administration: R/W, Metadata: R`
119119
Once the key has been obtained, add it to :code:`secrets.yml` under :code:`secrets_github_access_token`
120120

121-
7. If the host is an actual Infra VM then please refer to upstream `Infrastructure VMs <https://docs.openstack.org/kayobe/latest/configuration/reference/infra-vms.html>`__ documentation for additional configuration and steps.
121+
7. If the host is an actual Infra VM then please refer to upstream :kayobe-doc:`Infrastructure VMs <configuration/reference/infra-vms.html>` documentation for additional configuration and steps.
122122

123123
8. Run :code:`kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/deploy-github-runner.yml`
124124

doc/source/configuration/cloudkitty.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ Configuring in kayobe-config
88
By default, CloudKitty uses Gnocchi and Ceilometer as the collector and fetcher
99
backends. Unless the system has a specific reason not to, we recommend instead
1010
using Prometheus as the backend for both. The following instructions explain
11-
how to do this. Also, see the `Kolla Ansible docs on CloudKitty
12-
<https://docs.openstack.org/kolla-ansible/latest/reference/rating/cloudkitty-guide.html>`__
11+
how to do this. Also, see the :kolla-ansible-doc:`Kolla Ansible docs on CloudKitty
12+
<reference/rating/cloudkitty-guide.html>`
1313
for more details.
1414

1515
Enable CloudKitty and disable InfluxDB, as we are using OpenSearch as the

doc/source/index.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ Overview
1212
========
1313

1414
This documentation covers the StackHPC Kayobe configuration. It is intended to
15-
complement, rather than replace, the upstream :kayobe-doc:`Kayobe </>`,
16-
:kolla-doc:`Kolla </>` and :kolla-ansible-doc:`Kolla Ansible </>`
15+
complement, rather than replace, the upstream :kayobe-doc:`Kayobe <>`,
16+
:kolla-doc:`Kolla <>` and :kolla-ansible-doc:`Kolla Ansible<>`
1717
documentation.
1818

1919
The configuration includes various things, such as:

etc/kayobe/kolla-image-tags.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ kolla_image_tags:
3737
manila:
3838
rocky-9: 2023.1-rocky-9-20240809T102431
3939
neutron:
40-
rocky-9: 2023.1-rocky-9-20250303T162416
41-
ubuntu-jammy: 2023.1-ubuntu-jammy-20250303T162416
40+
rocky-9: 2023.1-rocky-9-20250311T093325
41+
ubuntu-jammy: 2023.1-ubuntu-jammy-20250311T093325
4242
nova:
4343
rocky-9: 2023.1-rocky-9-20240926T151818
4444
ubuntu-jammy: 2023.1-ubuntu-jammy-20240926T151818
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
---
2+
fixes:
3+
- |
4+
Fix some broken links in the docs.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
Reverts "Track all interfaces in Keepalived" so only HA interfaces are
5+
tracked. This prevents L3 HA router flapping when detaching floating IP
6+
addresses, because non-HA router interfaces did not include "no_track".
7+
Closes-Bug: #2097770

0 commit comments

Comments
 (0)