diff --git a/doc/source/_vendor/rl-strings.txt b/doc/source/_vendor/rl-strings.txt index 3632dfec0..c1359f2ee 100644 --- a/doc/source/_vendor/rl-strings.txt +++ b/doc/source/_vendor/rl-strings.txt @@ -63,11 +63,11 @@ .. |update-orchestration-of-central-clouds-regionone-and-subclouds| replace:: :ref:`Update Orchestration of Subclouds ` .. |configure-distributed-cloud-system-controller-geo-redundancy-e3a31d6bf662| replace:: :ref:`Configure Distributed Cloud System Controller GEO Redundancy ` .. |managing-subcloud-groups| replace:: :ref:`Manage Subcloud Groups ` -.. |create-an-upgrade-orchestration-using-horizon-9f8c6c2f3706| replace:: :ref:`Create an Upgrade Orchestration using Horizon ` +.. |create-a-software-deploy-orchestration-using-horizon-9f8c6c2f3706| replace:: :ref:`Create an Upgrade Orchestration using Horizon ` .. |create-subcloud-groups-using-the-horizon-web-interface-69d357303531| replace:: :ref:`Create Subcloud Groups Using the Horizon Web Interface ` .. |switching-to-a-subcloud-from-the-system-controller| replace:: :ref:`Switch to a Subcloud from the System Controller ` .. |update-management-for-distributed-cloud| replace:: :ref:`Update Management for Distributed Cloud ` -.. |apply-the-upgrade-strategy-using-horizon-d0aab18cc724| replace:: :ref:`Apply the Upgrade Strategy using Horizon ` +.. |apply-the-software-deploy-strategy-using-horizon-d0aab18cc724| replace:: :ref:`Apply the Software Deploy using Horizon ` .. |regionone-and-systemcontroller-modes| replace:: :ref:`RegionOne and SystemController Modes ` .. |overview-of-distributed-cloud| replace:: :ref:`Overview of Distributed Cloud ` .. |failure-prior-to-the-installation-of-n-plus-1-load-on-a-subcloud| replace:: :ref:`Failure Prior to the Installation of N+1 Load on a Subcloud ` diff --git a/doc/source/dist_cloud/kubernetes/apply-a-kubernetes-upgrade-strategy-using-horizon-2bb24c72e947.rst b/doc/source/dist_cloud/kubernetes/apply-a-kubernetes-upgrade-strategy-using-horizon-2bb24c72e947.rst index fe25322c1..6fc61c556 100644 --- a/doc/source/dist_cloud/kubernetes/apply-a-kubernetes-upgrade-strategy-using-horizon-2bb24c72e947.rst +++ b/doc/source/dist_cloud/kubernetes/apply-a-kubernetes-upgrade-strategy-using-horizon-2bb24c72e947.rst @@ -5,12 +5,12 @@ Apply a Kubernetes Upgrade Strategy using Horizon ================================================= You can use the Horizon Web interface to upgrade Kubernetes across the -Distributed Cloud system by applying the Kubernetes upgrade strategy for +Distributed Cloud system by applying the Kubernetes upgrade strategy for Distributed Cloud Orchestration. .. rubric:: |prereq| -Before you can apply the Kubernetes Upgrade strategy, you must upload and apply +Before you can apply the Kubernetes upgrade strategy, you must upload and apply one or more updates to the SystemController / central update repository, create the Kubernetes strategy for subclouds, and optionally adjust the configuration settings for updating nodes. @@ -21,20 +21,12 @@ settings for updating nodes. #. Select **Distributed Cloud Admin** > **Orchestration**. -#. On the **Orchestration** page, select the **Orchestration Strategy** tab. - - .. figure:: figures/bqu1525123082913.png - - Orchestration Strategy +#. On the **Orchestration** page, select the **Strategy** tab. #. Click Apply Strategy. * To monitor the progress of the overall Kubernetes Upgrade orchestration, - use the **Orchestration Strategy** tab. + use the **Strategy** tab. * To monitor the progress of host Kubernetes Upgrade on RegionOne or a subcloud, use the **Host Inventory** page on the subcloud. - - - - diff --git a/doc/source/dist_cloud/kubernetes/apply-the-firmware-update-strategy-using-horizon-e78bf11c7189.rst b/doc/source/dist_cloud/kubernetes/apply-the-firmware-update-strategy-using-horizon-e78bf11c7189.rst index 52ed861f8..ad161b471 100644 --- a/doc/source/dist_cloud/kubernetes/apply-the-firmware-update-strategy-using-horizon-e78bf11c7189.rst +++ b/doc/source/dist_cloud/kubernetes/apply-the-firmware-update-strategy-using-horizon-e78bf11c7189.rst @@ -14,16 +14,12 @@ Update Orchestration. #. Select **Distributed Cloud Admin** > **Orchestration**. -#. On the **Orchestration** page, select the **Orchestration Strategy** tab. - - .. figure:: figures/bqu1525123082913.png - - Orchestration Strategy +#. On the **Orchestration** page, select the **Strategy** tab. #. Click **Apply Strategy**. * To monitor the progress of the overall firmware update orchestration, use - the **Orchestration Strategy** tab. + the **Strategy** tab. * To monitor the progress of host firmware updates on RegionOne or a subcloud, use the **Host Inventory** page on the subcloud. diff --git a/doc/source/dist_cloud/kubernetes/apply-the-upgrade-strategy-using-horizon-d0aab18cc724.rst b/doc/source/dist_cloud/kubernetes/apply-the-software-deploy-strategy-using-horizon-d0aab18cc724.rst similarity index 58% rename from doc/source/dist_cloud/kubernetes/apply-the-upgrade-strategy-using-horizon-d0aab18cc724.rst rename to doc/source/dist_cloud/kubernetes/apply-the-software-deploy-strategy-using-horizon-d0aab18cc724.rst index 4f669f58f..32bb52d33 100644 --- a/doc/source/dist_cloud/kubernetes/apply-the-upgrade-strategy-using-horizon-d0aab18cc724.rst +++ b/doc/source/dist_cloud/kubernetes/apply-the-software-deploy-strategy-using-horizon-d0aab18cc724.rst @@ -1,8 +1,8 @@ -.. _apply-the-upgrade-strategy-using-horizon-d0aab18cc724: +.. _apply-the-software-deploy-strategy-using-horizon-d0aab18cc724: -======================================== -Apply the Upgrade Strategy using Horizon -======================================== +================================================ +Apply the Software Deploy Strategy using Horizon +================================================ You can upgrade the platform software across the Distributed Cloud system by applying the upgrade strategy for Distributed Cloud @@ -12,7 +12,7 @@ Upgrade Orchestration. .. rubric:: |prereq| Create the Upgrade strategy for subclouds. For more information, see -:ref:`create-an-upgrade-orchestration-using-horizon-9f8c6c2f3706`. +:ref:`create-a-software-deploy-orchestration-using-horizon-9f8c6c2f3706`. .. rubric:: |proc| @@ -20,16 +20,12 @@ Create the Upgrade strategy for subclouds. For more information, see #. Select **Distributed Cloud Admin** > **Orchestration**. -#. On the **Orchestration** page, select the **Orchestration Strategy** tab. - - .. figure:: figures/bqu1525123082913.png - - Orchestration Strategy +#. On the **Orchestration** page, select the **Strategy** tab. #. Click **Apply Strategy**. * To monitor the progress of the overall Upgrade orchestration, use the - **Orchestration Strategy** tab. + **Strategy** tab. * To monitor the progress of host Upgrades on RegionOne or a subcloud, use the **Host Inventory** page on the subcloud. diff --git a/doc/source/dist_cloud/kubernetes/applying-the-update-strategy-for-distributed-cloud.rst b/doc/source/dist_cloud/kubernetes/applying-the-update-strategy-for-distributed-cloud.rst index c1aa91b0f..0927c39b8 100644 --- a/doc/source/dist_cloud/kubernetes/applying-the-update-strategy-for-distributed-cloud.rst +++ b/doc/source/dist_cloud/kubernetes/applying-the-update-strategy-for-distributed-cloud.rst @@ -34,22 +34,18 @@ For more information, see :ref:`Update Management for Distributed Cloud .. _applying-the-update-strategy-for-distributed-cloud-steps-hrv-4nl-rdb: -Use |prod-dc| patch orchestration to update the subclouds: +Use |prod-dc| orchestration to update the subclouds: #. Select the **SystemController** region. #. Select **Distributed Cloud Admin** \> **Orchestration**. -#. On the **Orchestration** page, select the **Orchestration Strategy** - tab. - - .. image:: figures/bqu1525123082913.png - :width: 1000px +#. On the **Orchestration** page, select the **Strategy** tab. #. Click **Apply Strategy**. To monitor the progress of the overall update orchestration, use the - **Orchestration Strategy** tab. + **Strategy** tab. To monitor the progress of host updates on a subcloud, use the **Host Inventory** page on the subcloud. diff --git a/doc/source/dist_cloud/kubernetes/create-a-firmware-update-orchestration-strategy-using-horizon-cfecdb67cef2.rst b/doc/source/dist_cloud/kubernetes/create-a-firmware-update-orchestration-strategy-using-horizon-cfecdb67cef2.rst index 0234cffe4..fc453f0e7 100644 --- a/doc/source/dist_cloud/kubernetes/create-a-firmware-update-orchestration-strategy-using-horizon-cfecdb67cef2.rst +++ b/doc/source/dist_cloud/kubernetes/create-a-firmware-update-orchestration-strategy-using-horizon-cfecdb67cef2.rst @@ -31,11 +31,11 @@ You must be in the SystemController region. To change the mode, see #. Select **Distributed Cloud Admin** > **Orchestration**. -#. Select the **Orchestration Strategy** tab on the **Orchestration** page. +#. Select the **Strategy** tab on the **Orchestration** page. - .. figure:: figures/update-strategy-1.png + .. figure:: figures/orchestration-strategy-tab.png - Orchestration Strategy + Strategy #. Create a new strategy. @@ -72,14 +72,6 @@ You must be in the SystemController region. To change the mode, see ``max_parallel_subclouds`` defined for each subcloud group will be used by default. - **Force** - Default: False - - .. figure:: figures/create-strategy.png - - .. figure:: figures/create-strategy-2.png - - Create a strategy #. Adjust how device image nodes are updated on RegionOne and the subclouds. @@ -95,5 +87,4 @@ Only subclouds in the Managed state and whose patching sync status is settings, you must delete the current strategy and create a new one. You must confirm before applying the strategy. If the created strategy is older than 60 minutes, a warning message will be displayed. You can simply apply -the strategy or first verify that it is still valid. - +the strategy or first verify that it is still valid. \ No newline at end of file diff --git a/doc/source/dist_cloud/kubernetes/create-a-kubernetes-upgrade-orchestration-using-horizon-16742b62ffb2.rst b/doc/source/dist_cloud/kubernetes/create-a-kubernetes-upgrade-orchestration-using-horizon-16742b62ffb2.rst index ca4fce4a3..2700e2d5f 100644 --- a/doc/source/dist_cloud/kubernetes/create-a-kubernetes-upgrade-orchestration-using-horizon-16742b62ffb2.rst +++ b/doc/source/dist_cloud/kubernetes/create-a-kubernetes-upgrade-orchestration-using-horizon-16742b62ffb2.rst @@ -34,9 +34,9 @@ You can use the Horizon Web interface to check the alarm states: #. Select **Distributed Cloud Admin** > **Orchestration**. -#. On the **Orchestration** page, select the **Orchestration Strategy** tab. +#. On the **Orchestration** page, select the **Strategy** tab. - .. figure:: figures/update-strategy-1.png + .. figure:: figures/orchestration-strategy-tab.png :scale: 55% Orchestration Strategy @@ -81,25 +81,6 @@ You can use the Horizon Web interface to check the alarm states: ``max_parallel_subclouds`` defined for each subcloud group will be used by default. - **Force** - Default: False - - Force kube upgrade to a subcloud which is in-sync with system controller. - - .. figure:: figures/create-k8s-strategy.png - :width: 550 - - .. figure:: figures/create-k8s-strategy-2.png - :width: 550 - - .. figure:: figures/create-k8s-strategy-3.png - :width: 550 - - .. figure:: figures/create-k8s-strategy-4.png - :width: 550 - - Create a strategy - #. Adjust how Kubernetes is upgraded on RegionOne and on subclouds. #. Save the new strategy. diff --git a/doc/source/dist_cloud/kubernetes/create-an-upgrade-orchestration-using-horizon-9f8c6c2f3706.rst b/doc/source/dist_cloud/kubernetes/create-a-software-deploy-orchestration-using-horizon-9f8c6c2f3706.rst similarity index 71% rename from doc/source/dist_cloud/kubernetes/create-an-upgrade-orchestration-using-horizon-9f8c6c2f3706.rst rename to doc/source/dist_cloud/kubernetes/create-a-software-deploy-orchestration-using-horizon-9f8c6c2f3706.rst index 87c84b2f1..5177aaed2 100644 --- a/doc/source/dist_cloud/kubernetes/create-an-upgrade-orchestration-using-horizon-9f8c6c2f3706.rst +++ b/doc/source/dist_cloud/kubernetes/create-a-software-deploy-orchestration-using-horizon-9f8c6c2f3706.rst @@ -1,8 +1,8 @@ -.. _create-an-upgrade-orchestration-using-horizon-9f8c6c2f3706: +.. _create-a-software-deploy-orchestration-using-horizon-9f8c6c2f3706: -============================================= -Create an Upgrade Orchestration using Horizon -============================================= +==================================================== +Create a Software Deploy Orchestration using Horizon +==================================================== .. rubric:: |prereq| @@ -27,15 +27,21 @@ You must have completed the procedure in #. Select **Distributed Cloud Admin** > **Orchestration**. - #. On the **Orchestration** page, select the **Orchestration Strategy** tab. + #. On the **Orchestration** page, select the **Strategy** tab. #. Create the new strategy. - On the **Orchestration Strategy** tab, click **Create Strategy**. In the - **Create Strategy** dialog box, adjust the settings as needed. + On the **Strategy** tab, click **Create Strategy**. In the **Create + Strategy** dialog box, adjust the settings as needed. **Strategy Type** - Upgrade + Software Deploy + + **Release** + Release name. + + This option is available when **Strategy Type** is set to "Software + Deploy". **Apply to** Subcloud or Subcloud Group @@ -66,20 +72,6 @@ You must have completed the procedure in ``max_parallel_subclouds`` defined for each subcloud group will be used by default. - **Force** - Default: False - - Offline subcloud is not skipped. Applicable only when the strategy is - created to a single subcloud. - - .. image:: figures/create-upgrade-strategy.png - :width: 444 - - .. image:: figures/create-upgrade-strategy-2.png - :width: 444 - - Create an orchestration strategy - #. Adjust how the Upgrade on subclouds will be performed. #. Save the new strategy. @@ -91,5 +83,3 @@ You must have completed the procedure in strategy is older than 60 minutes, a warning message will be display on this popup. The user can apply the strategy or verify if it is still valid. - - diff --git a/doc/source/dist_cloud/kubernetes/create-subcloud-groups-using-the-horizon-web-interface-69d357303531.rst b/doc/source/dist_cloud/kubernetes/create-subcloud-groups-using-the-horizon-web-interface-69d357303531.rst index 9072b6767..e20051a70 100644 --- a/doc/source/dist_cloud/kubernetes/create-subcloud-groups-using-the-horizon-web-interface-69d357303531.rst +++ b/doc/source/dist_cloud/kubernetes/create-subcloud-groups-using-the-horizon-web-interface-69d357303531.rst @@ -16,10 +16,9 @@ You must be in **SystemController** region. To change the region, see #. Select **Distributed Cloud Admin** > **Orchestration**. -#. On the **Orchestration** page, select the **Subcloud Group - Management** tab. +#. On the **Orchestration** page, select the **Subcloud Group** tab. -#. On the **Subcloud Group Management** tab, click **Add Subcloud Group**. +#. On the **Subcloud Group** tab, click **Add Subcloud Group**. .. image:: figures/create-subcloud-1.jpg :width: 800 @@ -32,6 +31,4 @@ You must be in **SystemController** region. To change the region, see - Update apply type: Parallel or Serial; default Parallel. - Maximum parallel subclouds: default 2 - .. image:: figures/create-subcloud-2.png - #. Click **Create Subcloud Group**. diff --git a/doc/source/dist_cloud/kubernetes/creating-an-update-strategy-for-distributed-cloud-update-orchestration.rst b/doc/source/dist_cloud/kubernetes/creating-an-update-strategy-for-distributed-cloud-update-orchestration.rst index e9b57fe17..9d8e12f0f 100644 --- a/doc/source/dist_cloud/kubernetes/creating-an-update-strategy-for-distributed-cloud-update-orchestration.rst +++ b/doc/source/dist_cloud/kubernetes/creating-an-update-strategy-for-distributed-cloud-update-orchestration.rst @@ -6,12 +6,12 @@ Create an Update Strategy for Distributed Cloud Update Orchestration ==================================================================== -To update the subclouds with updates in the **Partial-Apply** state, you must -create an update strategy for |prod-dc| Update Orchestration. +To update previous release subclouds with updates in the **Partial-Apply** +state, you must create an update strategy for |prod-dc| Update Orchestration. -After a patch (update) has been **applied/removed/committed** on the -Central Cloud's RegionOne, the subclouds are audited and their patching sync -status is updated. This can take up to 15 minutes. +After an update is **activated/completed/deleted** on the Central Cloud's +RegionOne, the subclouds are audited and their patching sync status is updated. +This can take up to 15 minutes. If the Subclouds are in a **Managed** state and if the patching sync status is "out-of-sync", it can be orchestrated. @@ -22,8 +22,8 @@ Only one update strategy can exist at a time. The strategy controls how the subclouds are updated (for example, serially or in parallel). To determine how the nodes on each subcloud are updated, the update strategy -refers to separate configuration settings available on the Cloud Patching -Configuration tab. +refers to separate configuration settings available on the **Subcloud Strategy +Configurations** tab. .. rubric:: |prereq| @@ -36,20 +36,19 @@ You must be in **SystemController** region. To change the region, see #. Select **Distributed Cloud Admin** \> **Orchestration**. -#. On the **Orchestration** page, select the **Orchestration Strategy** +#. On the **Orchestration** page, select the **Strategy** tab. - .. image:: figures/create-strategy.png - :width: 444px - - -#. On the **Cloud Strategy Orchestration** tab, click **Create Strategy**. +#. Click **Create Strategy**. In the **Create Strategy** dialog box, adjust the settings as needed. **Strategy Type** Patch. + **Patch** + The patch ID to upload/apply on the subcloud. + **Apply to** Subcloud or Subcloud Group. @@ -80,19 +79,10 @@ You must be in **SystemController** region. To change the region, see This option is available when **Apply to** is set to "Subcloud" and **Subcloud** is set to **All subclouds**. - **Force** - default False. + **Upload Only** + Stops strategy after uploading patches to subclouds. - Offline subcloud is not skipped. Applicable only when the strategy is - created to a single subcloud. - - This option is available when **Strategy Type** is set to "Upgrade". - - .. image:: figures/update-strategy-2.png - :width: 444 - - .. image:: figures/update-strategy-3.png - :width: 444 + This option is available when **Strategy Type** is set to "Patch". #. Adjust how nodes are updated on the subclouds. diff --git a/doc/source/dist_cloud/kubernetes/customizing-the-update-configuration-for-distributed-cloud-update-orchestration.rst b/doc/source/dist_cloud/kubernetes/customizing-the-update-configuration-for-distributed-cloud-update-orchestration.rst index 90922a459..72772c1c9 100644 --- a/doc/source/dist_cloud/kubernetes/customizing-the-update-configuration-for-distributed-cloud-update-orchestration.rst +++ b/doc/source/dist_cloud/kubernetes/customizing-the-update-configuration-for-distributed-cloud-update-orchestration.rst @@ -25,10 +25,10 @@ independently. #. Select **Distributed Cloud Admin** \> **Orchestration**. -#. On the **Orchestration** page, select the **Cloud Patching Configuration** - tab. +#. On the **Orchestration** page, select the **Subcloud Strategy + Configurations** tab. - .. image:: figures/qfq1525194569886.png + .. image:: figures/orchestration-subcloud-strategy-config-tab.png :width: 1000px Take one of the following actions: @@ -39,17 +39,15 @@ independently. .. image:: figures/brk1525194697928.png - To save your changes, click **Edit Cloud Patching Configuration**. + To save your changes, click **Edit Subcloud Strategy Configurations**. - To create custom settings for an individual subcloud, click **Create - New Cloud Patching Configuration**. - - .. image:: figures/vzc1525194338519.png + New Subcloud Strategy Configurations**. In the **Subcloud** field, select the subcloud for the custom settings. - To save your configuration changes, click **Create Cloud Patching - Configuration**. The new configuration is added to the list. + To save your configuration changes, click **Create Subcloud Strategy + Configurations**. The new configuration is added to the list. .. image:: figures/vwa1525194889921.png diff --git a/doc/source/dist_cloud/kubernetes/distributed-upgrade-orchestration-process-using-the-cli.rst b/doc/source/dist_cloud/kubernetes/distributed-upgrade-orchestration-process-using-the-cli.rst index cc2ac7779..30ddc1f12 100644 --- a/doc/source/dist_cloud/kubernetes/distributed-upgrade-orchestration-process-using-the-cli.rst +++ b/doc/source/dist_cloud/kubernetes/distributed-upgrade-orchestration-process-using-the-cli.rst @@ -94,7 +94,7 @@ following conditions: You can configure an upgrade Distributed Cloud orchestration strategy using the dcmanager CLI or the Horizon web interface. If you prefer to use Horizon, see -:ref:`create-an-upgrade-orchestration-using-horizon-9f8c6c2f3706`. +:ref:`create-a-software-deploy-orchestration-using-horizon-9f8c6c2f3706`. .. rubric:: |proc| diff --git a/doc/source/dist_cloud/kubernetes/figures/create-k8s-strategy-2.png b/doc/source/dist_cloud/kubernetes/figures/create-k8s-strategy-2.png deleted file mode 100644 index e99175556..000000000 Binary files a/doc/source/dist_cloud/kubernetes/figures/create-k8s-strategy-2.png and /dev/null differ diff --git a/doc/source/dist_cloud/kubernetes/figures/create-k8s-strategy-3.png b/doc/source/dist_cloud/kubernetes/figures/create-k8s-strategy-3.png deleted file mode 100644 index fee6fd9ce..000000000 Binary files a/doc/source/dist_cloud/kubernetes/figures/create-k8s-strategy-3.png and /dev/null differ diff --git a/doc/source/dist_cloud/kubernetes/figures/create-k8s-strategy-4.png b/doc/source/dist_cloud/kubernetes/figures/create-k8s-strategy-4.png deleted file mode 100644 index 517e2ec0f..000000000 Binary files a/doc/source/dist_cloud/kubernetes/figures/create-k8s-strategy-4.png and /dev/null differ diff --git a/doc/source/dist_cloud/kubernetes/figures/create-k8s-strategy.png b/doc/source/dist_cloud/kubernetes/figures/create-k8s-strategy.png deleted file mode 100644 index e3b5f655f..000000000 Binary files a/doc/source/dist_cloud/kubernetes/figures/create-k8s-strategy.png and /dev/null differ diff --git a/doc/source/dist_cloud/kubernetes/figures/create-strategy-2.png b/doc/source/dist_cloud/kubernetes/figures/create-strategy-2.png deleted file mode 100644 index dadcf0a52..000000000 Binary files a/doc/source/dist_cloud/kubernetes/figures/create-strategy-2.png and /dev/null differ diff --git a/doc/source/dist_cloud/kubernetes/figures/create-strategy.png b/doc/source/dist_cloud/kubernetes/figures/create-strategy.png deleted file mode 100644 index 164cc1e39..000000000 Binary files a/doc/source/dist_cloud/kubernetes/figures/create-strategy.png and /dev/null differ diff --git a/doc/source/dist_cloud/kubernetes/figures/create-subcloud-2.png b/doc/source/dist_cloud/kubernetes/figures/create-subcloud-2.png deleted file mode 100644 index 3b41861a1..000000000 Binary files a/doc/source/dist_cloud/kubernetes/figures/create-subcloud-2.png and /dev/null differ diff --git a/doc/source/dist_cloud/kubernetes/figures/create-upgrade-strategy-2.png b/doc/source/dist_cloud/kubernetes/figures/create-upgrade-strategy-2.png deleted file mode 100644 index dadcf0a52..000000000 Binary files a/doc/source/dist_cloud/kubernetes/figures/create-upgrade-strategy-2.png and /dev/null differ diff --git a/doc/source/dist_cloud/kubernetes/figures/create-upgrade-strategy.png b/doc/source/dist_cloud/kubernetes/figures/create-upgrade-strategy.png deleted file mode 100644 index 164cc1e39..000000000 Binary files a/doc/source/dist_cloud/kubernetes/figures/create-upgrade-strategy.png and /dev/null differ diff --git a/doc/source/dist_cloud/kubernetes/figures/orchestration-strategy-tab.png b/doc/source/dist_cloud/kubernetes/figures/orchestration-strategy-tab.png new file mode 100644 index 000000000..6ad1b33ab Binary files /dev/null and b/doc/source/dist_cloud/kubernetes/figures/orchestration-strategy-tab.png differ diff --git a/doc/source/dist_cloud/kubernetes/figures/orchestration-subcloud-strategy-config-tab.png b/doc/source/dist_cloud/kubernetes/figures/orchestration-subcloud-strategy-config-tab.png new file mode 100644 index 000000000..6d893087d Binary files /dev/null and b/doc/source/dist_cloud/kubernetes/figures/orchestration-subcloud-strategy-config-tab.png differ diff --git a/doc/source/dist_cloud/kubernetes/figures/orchestration-subcloud-tab.png b/doc/source/dist_cloud/kubernetes/figures/orchestration-subcloud-tab.png new file mode 100644 index 000000000..2a777bdb0 Binary files /dev/null and b/doc/source/dist_cloud/kubernetes/figures/orchestration-subcloud-tab.png differ diff --git a/doc/source/dist_cloud/kubernetes/figures/software-management-regionone.png b/doc/source/dist_cloud/kubernetes/figures/software-management-regionone.png new file mode 100644 index 000000000..b97ebd668 Binary files /dev/null and b/doc/source/dist_cloud/kubernetes/figures/software-management-regionone.png differ diff --git a/doc/source/dist_cloud/kubernetes/figures/software-management-system-controller.png b/doc/source/dist_cloud/kubernetes/figures/software-management-system-controller.png new file mode 100644 index 000000000..174615a31 Binary files /dev/null and b/doc/source/dist_cloud/kubernetes/figures/software-management-system-controller.png differ diff --git a/doc/source/dist_cloud/kubernetes/index-dist-cloud-kub-95bef233eef0.rst b/doc/source/dist_cloud/kubernetes/index-dist-cloud-kub-95bef233eef0.rst index 95407f9bb..cf0d12263 100644 --- a/doc/source/dist_cloud/kubernetes/index-dist-cloud-kub-95bef233eef0.rst +++ b/doc/source/dist_cloud/kubernetes/index-dist-cloud-kub-95bef233eef0.rst @@ -179,8 +179,8 @@ Upgrade Orchestration for Distributed Cloud SubClouds :maxdepth: 1 distributed-upgrade-orchestration-process-using-the-cli - create-an-upgrade-orchestration-using-horizon-9f8c6c2f3706 - apply-the-upgrade-strategy-using-horizon-d0aab18cc724 + create-a-software-deploy-orchestration-using-horizon-9f8c6c2f3706 + apply-the-software-deploy-strategy-using-horizon-d0aab18cc724 aborting-the-distributed-upgrade-orchestration configuration-for-specific-subclouds robust-error-handling-during-an-orchestrated-upgrade diff --git a/doc/source/dist_cloud/kubernetes/reviewing-update-status-for-distributed-cloud-using-horizon.rst b/doc/source/dist_cloud/kubernetes/reviewing-update-status-for-distributed-cloud-using-horizon.rst index ee54985dd..945c87a41 100644 --- a/doc/source/dist_cloud/kubernetes/reviewing-update-status-for-distributed-cloud-using-horizon.rst +++ b/doc/source/dist_cloud/kubernetes/reviewing-update-status-for-distributed-cloud-using-horizon.rst @@ -23,17 +23,16 @@ subclouds. #. Select **Distributed Cloud Admin** \> **Software Management**. -#. On the **Software Management** page, select the **Patches** tab. +#. On the **Software Management** page, select the **Releases** tab. - .. image:: figures/tmj1525095688715.png + .. image:: figures/software-management-system-controller.png :width: 1000px .. note:: - The Patch State indicates whether the patch is available, - partially-applied or applied. Applied indicates that the update has - been installed on all hosts of the cloud (SystemController in this - case). + The Release State indicates whether the release is available, deploying + or deployed. Deployed indicates that the update has been installed on + all hosts of the cloud (SystemController in this case). #. Check the Update Sync Status of the subclouds. diff --git a/doc/source/dist_cloud/kubernetes/update-orchestration-of-central-clouds-regionone-and-subclouds.rst b/doc/source/dist_cloud/kubernetes/update-orchestration-of-central-clouds-regionone-and-subclouds.rst index ec906c0c2..5ebe3d791 100644 --- a/doc/source/dist_cloud/kubernetes/update-orchestration-of-central-clouds-regionone-and-subclouds.rst +++ b/doc/source/dist_cloud/kubernetes/update-orchestration-of-central-clouds-regionone-and-subclouds.rst @@ -48,29 +48,54 @@ To use update orchestration, complete the following workflow: As each subcloud is updated, it moves through the following states: - **initial** - The update has not started. + - For software deployment of a patch: - **pre-check** - Subcloud alarm status is being checked for management-affecting alarms. + **Initial** + The update has not started. - **updating patches** - Patches are being updated to synchronize with System Controller - updates. + **Precheck** + Subcloud alarm status is being checked for management-affecting + alarms. - **creating strategy** - The strategy is being created in the subcloud. + **Create VIM strategy** + The strategy is being created in the subcloud. - **applying strategy** - The strategy is being applied in the subcloud. + **Apply VIM strategy** + The strategy is being applied in the subcloud. - **finishing** - Updates that are no longer required are being deleted. + **Finish strategy** + Updates that are no longer required are being deleted. - Updates that require committing are being committed. + Updates that require committing are being committed. - **complete** - Updating has been completed successfully. + **Complete** + Updating has been completed successfully. + + - For software deployment of a major release (upgrade): + + **Initial** + The update has not started. + + **Precheck** + Subcloud alarm status is being checked for management-affecting + alarms. + + **Install license** + Installing release license. + + **Create VIM strategy** + The strategy is being created in the subcloud. + + **Apply VIM strategy** + The strategy is being applied in the subcloud. + + **Finish strategy** + Updates that are no longer required are being deleted. + + Updates that require committing are being committed. + + **Complete** + Updating has been completed successfully. During this process, alarms **900.001** and **900.101** are raised temporarily. diff --git a/doc/source/dist_cloud/kubernetes/uploading-and-applying-updates-to-systemcontroller-using-horizon.rst b/doc/source/dist_cloud/kubernetes/uploading-and-applying-updates-to-systemcontroller-using-horizon.rst index f247e8f74..33013cb5e 100644 --- a/doc/source/dist_cloud/kubernetes/uploading-and-applying-updates-to-systemcontroller-using-horizon.rst +++ b/doc/source/dist_cloud/kubernetes/uploading-and-applying-updates-to-systemcontroller-using-horizon.rst @@ -20,28 +20,26 @@ If you prefer, you can use the |CLI|. For more information, see #. Select **Distributed Cloud Admin** \> **Software Management**. -#. On the **Software Management** page, select the **Patches** tab. +#. On the **Software Management** page, select the **Releases** tab. - .. image:: figures/tmj1525095688715.png + .. image:: figures/software-management-system-controller.png :width: 1000px -#. On the **Patches** tab, click **Upload Patches**. +#. On the **Releases** tab, click **Upload Releases**. - In the **Upload Patches** dialog box, click **Browse** to select updates - (patches) for upload. + In the **Upload Releases** dialog box, click **Choose Files** to select + updates (releases) for upload. - .. image:: figures/cah1525101473925.png +#. In the dialog, click **Upload Releases**. -#. In the dialog, click **Upload Patches**. - - The update is added to the Patches list in the **Available** state. + The update is added to the Releases list in the **Available** state. .. image:: figures/uzw1525102534768.png -#. Click **Apply Patch**. +#. Click **Deploy Start**. - The state is updated to **Partial-Apply**. + The state is updated to **Deploying**. .. _uploading-and-applying-updates-to-systemcontroller-using-horizon-update-the-regionone: @@ -50,7 +48,7 @@ If you prefer, you can use the |CLI|. For more information, see Update the RegionOne -------------------- -To fully patch the Central Cloud's RegionOne through Horizon: +To fully deploy the Central Cloud's RegionOne through Horizon: #. Upload and apply updates to SystemController region, for more details see :ref:`configuring-update-orchestration`. @@ -62,7 +60,7 @@ To fully patch the Central Cloud's RegionOne through Horizon: .. image:: figures/regionone.png #. Go to **Admin** \> **Platform** \> **Software Management** and open the - **Patch Orchestration** tab. + **Deploy Orchestration** tab. #. Select **Create Strategy**. diff --git a/doc/source/node_management/kubernetes/host_inventory/hosts-tab.rst b/doc/source/node_management/kubernetes/host_inventory/hosts-tab.rst index 2a0d7da3c..beb41a173 100644 --- a/doc/source/node_management/kubernetes/host_inventory/hosts-tab.rst +++ b/doc/source/node_management/kubernetes/host_inventory/hosts-tab.rst @@ -246,10 +246,14 @@ A sample **Hosts** tab is illustrated below: drive. For more information, see :ref:`Delete a Host Using Horizon `. - **Install Patches** + **Deploy Software** Initiates any pending software update operations. Once successfully executed, the host returns back to the locked state. + **Rollback Software** + Initiates any pending software rollback operations. Once successfully + executed, the host returns back to the locked state. + .. xbookref See |updates-doc|: :ref:`Managing Software Updates ` for details.