From 887d8dbeb1c4944e732763580878524f0f755581 Mon Sep 17 00:00:00 2001 From: Srinivas-Anand-HPE Date: Tue, 1 Oct 2024 13:16:55 +0530 Subject: [PATCH 1/2] Remove with IUF in main Upgrade CSM from Upgrade CSM and additional products with IUF --- operations/iuf/IUF.md | 2 +- .../iuf/stages/management_nodes_rollout.md | 2 +- ... => upgrade_csm_and_additional_products.md} | 10 +++++----- ..._manual_and_additional_products_with_iuf.md | 2 +- upgrade/README.md | 2 +- upgrade/Stage_0_Prerequisites.md | 18 ++++++++---------- upgrade/Upgrade_Only_CSM_with_iuf.md | 2 +- 7 files changed, 18 insertions(+), 20 deletions(-) rename operations/iuf/workflows/{upgrade_csm_and_additional_products_with_iuf.md => upgrade_csm_and_additional_products.md} (97%) diff --git a/operations/iuf/IUF.md b/operations/iuf/IUF.md index b745b45e0c04..1e3be3f456f5 100644 --- a/operations/iuf/IUF.md +++ b/operations/iuf/IUF.md @@ -98,7 +98,7 @@ There are two separate workflows that utilize IUF when installing or upgrading n - An initial install or upgrade is being performed **with non-CSM products only**. In this scenario, the first step ("Perform an install of CSM") is skipped and all other steps are performed. -1. The [Upgrade CSM and additional products with IUF](workflows/upgrade_csm_and_additional_products_with_iuf.md) +1. The [Upgrade CSM and additional products](workflows/upgrade_csm_and_additional_products.md) workflow is used when an upgrade is being performed **with CSM and non-CSM products**. ## Activities diff --git a/operations/iuf/stages/management_nodes_rollout.md b/operations/iuf/stages/management_nodes_rollout.md index b8f7f1a1b222..282c4b29ece5 100644 --- a/operations/iuf/stages/management_nodes_rollout.md +++ b/operations/iuf/stages/management_nodes_rollout.md @@ -190,7 +190,7 @@ Follow these steps when upgrading `ncn-m001` during [3.1 `management-nodes-rollout` with CSM upgrade](../workflows/management_rollout.md#31-management-nodes-rollout-with-csm-upgrade) when following the procedures in [Install or upgrade additional products with IUF](../workflows/install_or_upgrade_additional_products_with_iuf.md) -or [Upgrade CSM and additional products with IUF](../workflows/upgrade_csm_and_additional_products_with_iuf.md). +or [Upgrade CSM and additional products](../workflows/upgrade_csm_and_additional_products.md). 1. (`ncn-mw#`) Set the `IMS_RESULTANT_IMAGE_ID` to be the `final_image_id` found in [3.1 `management-nodes-rollout` with CSM upgrade](../workflows/management_rollout.md#31-management-nodes-rollout-with-csm-upgrade). Then update the BSS parameters for `ncn-m001`. diff --git a/operations/iuf/workflows/upgrade_csm_and_additional_products_with_iuf.md b/operations/iuf/workflows/upgrade_csm_and_additional_products.md similarity index 97% rename from operations/iuf/workflows/upgrade_csm_and_additional_products_with_iuf.md rename to operations/iuf/workflows/upgrade_csm_and_additional_products.md index 1df1a14ca040..a7d82ad34390 100644 --- a/operations/iuf/workflows/upgrade_csm_and_additional_products_with_iuf.md +++ b/operations/iuf/workflows/upgrade_csm_and_additional_products.md @@ -1,4 +1,4 @@ -# Upgrade CSM and additional products with IUF +# Upgrade CSM and additional products This procedure is used when performing an upgrade of Cray System Management (CSM) along with additional HPE Cray EX software products at the same time. This procedure would be used when @@ -15,11 +15,11 @@ and [Slingshot Host Software (SHS)](../../../glossary.md#slingshot-host-software There are two options to upgrade CSM and additional HPE Cray EX software products: +1. This option is for upgrading CSM and additional HPE Cray EX software products using IUF. See +[Upgrade CSM and additional products with IUF](upgrade_csm_iuf_additional_products_with_iuf.md) +for that procedure. + 1. This option alternates between CSM upgrade instructions that do not utilize IUF and instructions for upgrading additional HPE Cray EX software products whose installation is managed by the IUF. See [Upgrade CSM manually and additional products with IUF](upgrade_csm_manual_and_additional_products_with_iuf.md) for that procedure. - -1. This option is for upgrading CSM and additional HPE Cray EX software products using IUF. See -[Upgrade CSM and additional products with IUF](upgrade_csm_iuf_additional_products_with_iuf.md) -for that procedure. diff --git a/operations/iuf/workflows/upgrade_csm_manual_and_additional_products_with_iuf.md b/operations/iuf/workflows/upgrade_csm_manual_and_additional_products_with_iuf.md index 56d374f4888a..1684606392a5 100644 --- a/operations/iuf/workflows/upgrade_csm_manual_and_additional_products_with_iuf.md +++ b/operations/iuf/workflows/upgrade_csm_manual_and_additional_products_with_iuf.md @@ -9,7 +9,7 @@ configurations. Manual operations are documented for procedures that are not cur The upgrade workflow comprises the following procedures. The diagram shows the workflow and the steps below it provide detailed instructions which must be executed in the order shown. -![Upgrade CSM and additional products with IUF](../../../img/operations/diagram_csm_stack_upgrade_111723.png) +![Upgrade CSM manually and additional products with IUF](../../../img/operations/diagram_csm_stack_upgrade_111723.png) 1. CSM preparation, Stage 0.1, and Stage 0.2 diff --git a/upgrade/README.md b/upgrade/README.md index 0e25e1dca6bd..542fbab17e72 100644 --- a/upgrade/README.md +++ b/upgrade/README.md @@ -32,7 +32,7 @@ latest patch release of CSM 1.6. ### Option 1: Upgrade CSM with additional HPE Cray EX software products To perform an upgrade of CSM along with additional HPE Cray EX software products, see the -[Upgrade CSM and additional products with IUF](../operations/iuf/workflows/upgrade_csm_and_additional_products_with_iuf.md) +[Upgrade CSM and additional products](../operations/iuf/workflows/upgrade_csm_and_additional_products.md) procedure. This is the most common procedure to follow, and it should be used when performing an upgrade from diff --git a/upgrade/Stage_0_Prerequisites.md b/upgrade/Stage_0_Prerequisites.md index c92fad52c903..e09897da7e69 100644 --- a/upgrade/Stage_0_Prerequisites.md +++ b/upgrade/Stage_0_Prerequisites.md @@ -15,8 +15,8 @@ Stage 0 has several critical procedures which prepare the environment and verify - [Manual copy](#manual-copy) - [Stage 0.2 - Prerequisites](#stage-02---prerequisites) - [Stage 0.3 - Update management node CFS configuration and customize worker node image](#stage-03---update-management-node-cfs-configuration-and-customize-worker-node-image) - - [Option 1: Upgrade of CSM manually and additional products](#option-1-upgrade-of-csm-manually-and-additional-products) - - [Option 2: Upgrade of CSM on CSM-only system](#option-2-upgrade-of-csm-on-csm-only-system) + - [Option 1: Upgrade of CSM manually and additional products with IUF](#option-1-upgrade-of-csm-manually-and-additional-products-with-iuf) + - [Option 2: Upgrade of CSM on CSM-only system](#option-2-upgrade-of-csm-manually-on-csm-only-system) - [Stop typescript](#stop-typescript) - [Stage completed](#stage-completed) @@ -209,21 +209,19 @@ after it has booted. There are several options for this stage. Use the option which applies to the current upgrade scenario. -- [Option 1: Upgrade of CSM manually and additional products](#option-1-upgrade-of-csm-manually-and-additional-products) -- [Option 2: Upgrade of CSM on CSM-only system](#option-2-upgrade-of-csm-on-csm-only-system) +- [Option 1: Upgrade of CSM manually and additional products with IUF](#option-1-upgrade-of-csm-manually-and-additional-products-with-iuf) +- [Option 2: Upgrade of CSM on CSM-only system](#option-2-upgrade-of-csm-manually-on-csm-only-system) -### Option 1: Upgrade of CSM manually and additional products +### Option 1: Upgrade of CSM manually and additional products with IUF -If performing an upgrade of CSM and additional HPE Cray EX software products, this stage -should not be performed. Instead, the [Upgrade CSM and additional products with IUF](../operations/iuf/workflows/upgrade_csm_and_additional_products_with_iuf.md) -procedure should be followed as described in the first option of the [Upgrade CSM](../upgrade/README.md) procedure, -[Option 1: Upgrade CSM with additional HPE Cray EX software products](../upgrade/README.md#option-1-upgrade-csm-with-additional-hpe-cray-ex-software-products) +If performing an upgrade of CSM manually and additional HPE Cray EX software products with IUF, this stage +should not be performed. Instead, the [Upgrade CSM manually and additional products with IUF](../operations/iuf/workflows/upgrade_csm_manual_and_additional_products_with_iuf.md) That procedure will perform the appropriate steps to create a CFS configuration for management nodes and perform management node image customization during the [Image Preparation](../operations/iuf/workflows/image_preparation.md) step. -### Option 2: Upgrade of CSM on CSM-only system +### Option 2: Upgrade of CSM manually on CSM-only system Use this alternative if performing an upgrade of CSM on a CSM-only system with no other HPE Cray EX software products installed. This upgrade scenario is extremely uncommon in production environments. diff --git a/upgrade/Upgrade_Only_CSM_with_iuf.md b/upgrade/Upgrade_Only_CSM_with_iuf.md index 66918015565b..d3c1ee9b56e2 100644 --- a/upgrade/Upgrade_Only_CSM_with_iuf.md +++ b/upgrade/Upgrade_Only_CSM_with_iuf.md @@ -3,7 +3,7 @@ This option describes how to upgrade Cray Systems Management (CSM) software on a CSM-only system using IUF. -![Upgrade CSM and additional products with IUF](../img/operations/diagram_csm_stack_upgrade_111723.png) +![Upgrade only CSM through IUF](../img/operations/diagram_csm_stack_upgrade_111723.png) 1. CSM preparation From 9769f94ddc29647678fd4391587ec267b5870aa1 Mon Sep 17 00:00:00 2001 From: Russell Bunch Date: Tue, 1 Oct 2024 14:16:15 -0500 Subject: [PATCH 2/2] Update upgrade/Stage_0_Prerequisites.md Signed-off-by: Russell Bunch --- upgrade/Stage_0_Prerequisites.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/upgrade/Stage_0_Prerequisites.md b/upgrade/Stage_0_Prerequisites.md index e09897da7e69..89862e6b61b1 100644 --- a/upgrade/Stage_0_Prerequisites.md +++ b/upgrade/Stage_0_Prerequisites.md @@ -214,8 +214,7 @@ scenario. ### Option 1: Upgrade of CSM manually and additional products with IUF -If performing an upgrade of CSM manually and additional HPE Cray EX software products with IUF, this stage -should not be performed. Instead, the [Upgrade CSM manually and additional products with IUF](../operations/iuf/workflows/upgrade_csm_manual_and_additional_products_with_iuf.md) +This stage should not be performed when upgrading CSM manually and additional HPE Cray EX software products with IUF. Instead, refer to the [Upgrade CSM manually and additional products with IUF](../operations/iuf/workflows/upgrade_csm_manual_and_additional_products_with_iuf.md) procedure. That procedure will perform the appropriate steps to create a CFS configuration for management nodes and perform management node image customization during the