Merge "USM updates (dsR10)"

This commit is contained in:
Zuul 2024-12-11 19:38:21 +00:00 committed by Gerrit Code Review
commit 4ad3f5b2aa
2 changed files with 11 additions and 8 deletions

View File

@ -120,10 +120,12 @@ standard configuration.
| <new-release>.iso | <new-release-id> | | <new-release>.iso | <new-release-id> |
+-------------------------------+-------------------+ +-------------------------------+-------------------+
where `--local`` can be used when running this command in an |SSH| session on where ``--local`` can be used when running this command in an |SSH|
the active controller to optimize performance. With this option, the session on the active controller to optimize performance. With this
system will read files directly from the local disk rather than option, the system will read files directly from the local disk rather
transferring files over REST APIs backing the |CLI|. than transferring files over REST APIs backing the |CLI|. When using the
``--local`` option, the '<new-release>.iso' and the <new-release>.sig
arguments MUST be a full path name.
This command may take 5-10 mins depending on the hardware. This command may take 5-10 mins depending on the hardware.
@ -273,8 +275,9 @@ standard configuration.
host to finish rebooting and become enabled. This may take 3-5 mins host to finish rebooting and become enabled. This may take 3-5 mins
depending on hardware. depending on hardware.
#. Proceed to step :ref:`8 <manual-host-software-deployment-ee17ec6f71a4-step>` (software #. Proceed to step :ref:`Activate the software deployment
deploy activate) of the main procedure. <manual-host-software-deployment-ee17ec6f71a4-step>` (software deploy
activate) of the main procedure.
- For an |AIO-DX| system or standard system - For an |AIO-DX| system or standard system

View File

@ -40,7 +40,7 @@ activate, complete, and delete the new software deployment.
.. note:: .. note::
Software deployment orchestration completes and deletes the new software Software deployment orchestration completes and deletes the new software
deployment only when the ``-delete`` option is selected by the user during deployment only when the ``--delete`` option is selected by the user during
create strategy. In case of a Major Release, if the software deployment is create strategy. In case of a Major Release, if the software deployment is
deleted, it can no longer be rolled back. deleted, it can no longer be rolled back.
@ -564,7 +564,7 @@ to control and monitor their progress manually.
.. code-block:: .. code-block::
[sysadmin@controller-0 ~(keystone_admin)]$ sw-manager sw-deploy-strategy show --error-details ~(keystone_admin)]$ sw-manager sw-deploy-strategy show --error-details
.. code-block:: .. code-block::