Merge "Fix up order of charm and payload upgrades"

deploy-guide/source/upgrade-charms.rst

@@ -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/

deploy-guide/source/upgrade-openstack.rst

@@ -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/