From deda1c4e863b6c3f61bb1ae099605f5f12724e8a Mon Sep 17 00:00:00 2001 From: Ngairangbam Mili Date: Wed, 13 Sep 2023 04:48:18 +0000 Subject: [PATCH] Integration of Deployment Manager (ds8) Story: 2010718 Task: 48735 Change-Id: I328095360526cfcd546ff795cbd4082995c08992 Signed-off-by: Ngairangbam Mili --- .../performing-an-orchestrated-upgrade-using-the-cli.rest | 5 ++++- .../_includes/upgrading-all-in-one-duplex-or-standard.rest | 5 ++++- doc/source/_includes/upgrading-all-in-one-simplex.rest | 5 ++++- .../upgrading-the-systemcontroller-using-the-cli.rest | 6 +++++- ...subcloud-without-redfish-platform-management-service.rst | 2 +- .../upgrading-the-systemcontroller-using-the-cli.rst | 6 ++++++ .../performing-an-orchestrated-upgrade-using-the-cli.rst | 6 ++++++ .../kubernetes/upgrading-all-in-one-duplex-or-standard.rst | 6 ++++++ .../updates/kubernetes/upgrading-all-in-one-simplex.rst | 6 ++++++ 9 files changed, 42 insertions(+), 5 deletions(-) diff --git a/doc/source/_includes/performing-an-orchestrated-upgrade-using-the-cli.rest b/doc/source/_includes/performing-an-orchestrated-upgrade-using-the-cli.rest index 62e1a406a..abbb15909 100644 --- a/doc/source/_includes/performing-an-orchestrated-upgrade-using-the-cli.rest +++ b/doc/source/_includes/performing-an-orchestrated-upgrade-using-the-cli.rest @@ -1,4 +1,7 @@ .. Orchupgradecli-begin -.. Orchupgradecli-end \ No newline at end of file +.. Orchupgradecli-end + +.. deploymentmanager-begin +.. deploymentmanager-end \ No newline at end of file diff --git a/doc/source/_includes/upgrading-all-in-one-duplex-or-standard.rest b/doc/source/_includes/upgrading-all-in-one-duplex-or-standard.rest index ab37740d3..f0de7c6dd 100644 --- a/doc/source/_includes/upgrading-all-in-one-duplex-or-standard.rest +++ b/doc/source/_includes/upgrading-all-in-one-duplex-or-standard.rest @@ -1,4 +1,7 @@ .. upgradeDX-begin -.. upgradeDX-end \ No newline at end of file +.. upgradeDX-end + +.. deploymentmanager-begin +.. deploymentmanager-end \ No newline at end of file diff --git a/doc/source/_includes/upgrading-all-in-one-simplex.rest b/doc/source/_includes/upgrading-all-in-one-simplex.rest index 669a0834e..7243277f7 100644 --- a/doc/source/_includes/upgrading-all-in-one-simplex.rest +++ b/doc/source/_includes/upgrading-all-in-one-simplex.rest @@ -1,4 +1,7 @@ .. upgradeAIO-begin -.. upgradeAIO-end \ No newline at end of file +.. upgradeAIO-end + +.. deploymentmanager-begin +.. deploymentmanager-end \ No newline at end of file diff --git a/doc/source/_includes/upgrading-the-systemcontroller-using-the-cli.rest b/doc/source/_includes/upgrading-the-systemcontroller-using-the-cli.rest index 0888e0088..b616af13e 100644 --- a/doc/source/_includes/upgrading-the-systemcontroller-using-the-cli.rest +++ b/doc/source/_includes/upgrading-the-systemcontroller-using-the-cli.rest @@ -9,4 +9,8 @@ .. wrsend .. DMupgrades-begin -.. DMupgrades-end \ No newline at end of file +.. DMupgrades-end + +.. deploymentmanager-begin +.. deploymentmanager-end + diff --git a/doc/source/dist_cloud/kubernetes/installing-a-subcloud-without-redfish-platform-management-service.rst b/doc/source/dist_cloud/kubernetes/installing-a-subcloud-without-redfish-platform-management-service.rst index 0958d8dc1..e5bf2c050 100644 --- a/doc/source/dist_cloud/kubernetes/installing-a-subcloud-without-redfish-platform-management-service.rst +++ b/doc/source/dist_cloud/kubernetes/installing-a-subcloud-without-redfish-platform-management-service.rst @@ -295,7 +295,7 @@ subcloud, the subcloud installation process has two phases: ~(keystone_admin)]$ system certificate-install -m docker_registry path_to_cert - .. include:: /_includes/installing-a-subcloud-without-redfish-platform-management-service.rest + .. pre-include:: /_includes/installing-a-subcloud-without-redfish-platform-management-service.rest :start-after: begin-prepare-files-to-copy-deployment-config :end-before: end-prepare-files-to-copy-deployment-config diff --git a/doc/source/dist_cloud/kubernetes/upgrading-the-systemcontroller-using-the-cli.rst b/doc/source/dist_cloud/kubernetes/upgrading-the-systemcontroller-using-the-cli.rst index 885d1ed78..16e7e6b17 100644 --- a/doc/source/dist_cloud/kubernetes/upgrading-the-systemcontroller-using-the-cli.rst +++ b/doc/source/dist_cloud/kubernetes/upgrading-the-systemcontroller-using-the-cli.rst @@ -466,6 +466,12 @@ Follow the steps below to manually upgrade the system controller: configuration is applied. The upgrade state goes from **activating** to **activation-complete** once this is done. + .. only:: partner + + .. include:: /_includes/upgrading-the-systemcontroller-using-the-cli.rest + :start-after: deploymentmanager-begin + :end-before: deploymentmanager-end + The following states apply when this command is executed. **activation-requested** diff --git a/doc/source/updates/kubernetes/performing-an-orchestrated-upgrade-using-the-cli.rst b/doc/source/updates/kubernetes/performing-an-orchestrated-upgrade-using-the-cli.rst index f9e0b9312..00bc02e8e 100644 --- a/doc/source/updates/kubernetes/performing-an-orchestrated-upgrade-using-the-cli.rst +++ b/doc/source/updates/kubernetes/performing-an-orchestrated-upgrade-using-the-cli.rst @@ -258,6 +258,12 @@ described below to upgrade the remaining nodes of the |prod|. configuration is applied. The upgrade state goes from **activating** to **activation-complete** once this is done. + .. only:: partner + + .. include:: /_includes/performing-an-orchestrated-upgrade-using-the-cli.rest + :start-after: deploymentmanager-begin + :end-before: deploymentmanager-end + .. code-block:: none ~(keystone_admin)]$ system upgrade-activate diff --git a/doc/source/updates/kubernetes/upgrading-all-in-one-duplex-or-standard.rst b/doc/source/updates/kubernetes/upgrading-all-in-one-duplex-or-standard.rst index aa77d2899..b8d1ff8cc 100644 --- a/doc/source/updates/kubernetes/upgrading-all-in-one-duplex-or-standard.rst +++ b/doc/source/updates/kubernetes/upgrading-all-in-one-duplex-or-standard.rst @@ -484,6 +484,12 @@ of |prod| software. configuration is applied. The upgrade state goes from ``activating`` to ``activation-complete`` once this is done. + .. only:: partner + + .. include:: /_includes/upgrading-all-in-one-duplex-or-standard.rest + :start-after: deploymentmanager-begin + :end-before: deploymentmanager-end + The following states apply when this command is executed. ``activation-requested`` diff --git a/doc/source/updates/kubernetes/upgrading-all-in-one-simplex.rst b/doc/source/updates/kubernetes/upgrading-all-in-one-simplex.rst index 5a84c3daf..d28549bed 100644 --- a/doc/source/updates/kubernetes/upgrading-all-in-one-simplex.rst +++ b/doc/source/updates/kubernetes/upgrading-all-in-one-simplex.rst @@ -371,6 +371,12 @@ For more details, see :ref:`Contents of System Backup configuration is applied. The upgrade state goes from *activating* to *activation-complete* once this is done. + .. only:: partner + + .. include:: /_includes/upgrading-all-in-one-simplex.rest + :start-after: deploymentmanager-begin + :end-before: deploymentmanager-end + .. code-block:: none ~(keystone_admin)]$ system upgrade-activate