Remove with IUF in main Upgrade CSM from Upgrade CSM and additional p…

…roducts with IUF

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

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`.

operations/iuf/workflows/upgrade_csm_and_additional_products_with_iuf.md → 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.

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
 

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

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.

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