Fix up order of charm and payload upgrades

Improve the information on order lists for both charm and
payload upgrades.

Add the following charms to the charms order:

* manila-ganesha
* octavia

Add the following charm to the payload order:

* manila-ganesha

The manila-generic alpha charm was erroneously included
in both lists. Remove it.

Add a note to both pages stating that only stable charms
are currently considered.

On the charms page it is mentioned that the given order is
based on internal testing because it is also stated that
order is irrelevant. The sentence was dropped from the
payload page because the order is not irrelevant.

Closes-Bug: #1959632
Change-Id: I3a71c3ed1a1d5c0463db8ca3ec598cd53aedf3c7
This commit is contained in:
Peter Matulis 2022-02-07 13:51:01 -05:00
parent 2f10c10853
commit 84937d2154
2 changed files with 17 additions and 12 deletions

View File

@ -34,13 +34,17 @@ testing.
The general order is:
#. all principle charms
#. all principal charms
#. all subordinate charms
The precise order within the group of principle charms is shown in the below
The precise order within the group of principal charms is shown in the below
table.
.. list-table:: Principle charms
.. note::
At this time, only stable charms are listed in the upgrade order table.
.. list-table:: Principal charms
:header-rows: 1
:widths: auto
@ -96,7 +100,7 @@ table.
- `manila`_
* - 17
- `manila-generic`_
- `manila-ganesha`_
* - 18
- `neutron-api`_
@ -128,8 +132,11 @@ table.
* - 27
- `swift-storage`_
* - 28
- `octavia`_
Upgrade testing for subordinate charms does not follow a prescribed order. Once
all the principle charms have been processed all the subordinate charms can
all the principal charms have been processed all the subordinate charms can
then be upgraded in any order.
Perform the upgrade
@ -282,5 +289,3 @@ Based on the above, the ceph-mon charm does not require an upgrade.
.. _trilio-horizon-plugin: https://opendev.org/openstack/charm-trilio-horizon-plugin/
.. _trilio-wlm: https://opendev.org/openstack/charm-trilio-wlm/
.. _vault: https://opendev.org/openstack/charm-vault/
.. _manila-generic: https://opendev.org/openstack/charm-manila-generic/

View File

@ -252,14 +252,16 @@ OpenStack services should be upgraded. Each service represented by a charm will
need to be upgraded individually, and only the packages associated with a
charm's OpenStack service will be updated.
The order provided below is the order used by internal testing.
.. warning::
Ceph may require one of its options to be set prior to upgrading, and
failure to consider this may result in a broken cluster. See the associated
:ref:`upgrade issue <ceph-require-osd-release>`.
.. note::
At this time, only stable charms are listed in the upgrade order table.
.. list-table::
:header-rows: 1
:widths: auto
@ -310,7 +312,7 @@ The order provided below is the order used by internal testing.
- `manila`_
* - 15
- `manila-generic`_
- `manila-ganesha`_
* - 16
- `neutron-api`_
@ -630,5 +632,3 @@ Check for errors in :command:`juju status` output and any monitoring service.
.. _trilio-horizon-plugin: https://opendev.org/openstack/charm-trilio-horizon-plugin/
.. _trilio-wlm: https://opendev.org/openstack/charm-trilio-wlm/
.. _vault: https://opendev.org/openstack/charm-vault/
.. _manila-generic: https://opendev.org/openstack/charm-manila-generic/