diff --git a/deploy-guide/source/upgrade-charms.rst b/deploy-guide/source/upgrade-charms.rst index a2a6d06..d68af7b 100644 --- a/deploy-guide/source/upgrade-charms.rst +++ b/deploy-guide/source/upgrade-charms.rst @@ -106,22 +106,22 @@ table. - `neutron-api`_ * - 19 - - `neutron-gateway`_ or `ovn-central`_ + - `neutron-gateway`_ or `ovn-dedicated-chassis`_ * - 20 - - `placement`_ + - `ovn-central`_ * - 21 - - `nova-cloud-controller`_ - - * - 22 - - `openstack-dashboard`_ - - * - 23 - `nova-compute`_ + * - 22 + - `placement`_ + + * - 23 + - `nova-cloud-controller`_ + * - 24 - - `ovn-dedicated-chassis`_ + - `openstack-dashboard`_ * - 25 - `ceph-osd`_ diff --git a/deploy-guide/source/upgrade-openstack.rst b/deploy-guide/source/upgrade-openstack.rst index 7318939..73bfb49 100644 --- a/deploy-guide/source/upgrade-openstack.rst +++ b/deploy-guide/source/upgrade-openstack.rst @@ -318,22 +318,22 @@ charm's OpenStack service will be updated. - `neutron-api`_ * - 17 - - `neutron-gateway`_ or `ovn-central`_ + - `neutron-gateway`_ or `ovn-dedicated-chassis`_ * - 18 - - `placement`_ + - `ovn-central`_ * - 19 - - `nova-cloud-controller`_ - - * - 20 - - `openstack-dashboard`_ - - * - 21 - `nova-compute`_ + * - 20 + - `placement`_ + + * - 21 + - `nova-cloud-controller`_ + * - 22 - - `ovn-dedicated-chassis`_ + - `openstack-dashboard`_ * - 23 - `ceph-osd`_ @@ -347,6 +347,12 @@ charm's OpenStack service will be updated. * - 26 - `octavia`_ +.. note:: + + The OVN control plane will not be available between the commencement of the + ovn-central upgrade and the completion of the nova-compute upgrade. They are + deliberately placed in close proximity to each other for this reason. + .. note:: An Octavia upgrade may entail an update of its load balancers (amphorae) as diff --git a/tox.ini b/tox.ini index b89c5f3..a5592df 100644 --- a/tox.ini +++ b/tox.ini @@ -12,5 +12,5 @@ deps = -r{toxinidir}/requirements.txt commands = {posargs} [testenv:deploy-guide] -commands = sphinx-build -a -W -d deploy-guide/build/doctrees -b html deploy-guide/source deploy-guide/build/html +commands = sphinx-build -j auto -W -d deploy-guide/build/doctrees -b html deploy-guide/source deploy-guide/build/html whereto deploy-guide/source/_extra/.htaccess deploy-guide/test/redirect-tests.txt