Merge pull request #211329 from jahjha/patch-12

Update install-software.md

Author: Court72

articles/center-sap-solutions/install-software.md

@@ -64,7 +64,7 @@ The following components are necessary for the SAP installation:
 
 ## Option 1: Upload software components with script
 
-You can use the following method to upload the SAP components to your Azure account using scripts. Then, you can [run the software installation wizard](#install-software) to install the SAP software.
+You can use the following method to upload the SAP components to your Azure account using scripts. Then, you can [run the software installation wizard](#install-software) to install the SAP software. We recommend using this method.
 
 You also can [upload the components manually](#option-2-upload-software-components-manually) instead.
 
@@ -86,8 +86,10 @@ Before you can download the software, set up an Azure Storage account for storin
 
  1. Grant the ACSS application *Azure SAP Workloads Management* **Storage Blob Data Reader** and **Reader and Data Access** role access on this storage account.
 
-### Download supporting software 
-After setting up your Azure Storage account, you need an Ubuntu VM to run scripts that download the software components.
+
+### Download SAP media
+
+You can download the SAP installation media required to install the SAP software, using a script as described in this section.
 
 1. Create an Ubuntu 20.04 VM in Azure
 
@@ -108,82 +110,62 @@ After setting up your Azure Storage account, you need an Ubuntu VM to run script
     az login
     ```
 
-1. Download the following shell script for the deployer VM packages.
+1. Install Ansible 2.9.27 on the ubuntu VM 
 
-    ```azurecli
-    wget "https://raw.githubusercontent.com/Azure/Azure-Center-for-SAP-solutions-preview/main/DownloadDeployerVMPackages.sh" -O "DownloadDeployerVMPackages.sh"
+    ```bash
+    sudo pip3 install ansible==2.9.27
     ```
+    
+1. Clone the SAP automation repository from GitHub.
 
-1. Update the shell script's file permissions.
-
-    ```azurecli
-    chmod +x DownloadDeployerVMPackages.sh
+    ```git bash
+    git clone https://github.com/Azure/sap-automation.git
     ```
 
-1. Run the shell script.
+1. Change the branch to main
 
-    ```azurecli
-    ./DownloadDeployerVMPackages.sh
+    ```git bash
+    git checkout main
     ```
-
-1. When asked if you have a storage account, enter `Y`.
-
-1. When asked for the base path to the software storage account, enter the container path. To find the container path:
 
-    1. Find the storage account that you created in the Azure portal.
+1. [Optional] : Verify if the current branch is "main"
 
-    1. Find the container named `sapbits`.
 
-    1. On the container's sidebar menu, select **Properties** under **Settings**.
+    ```git bash
+    git status
+    ```
 
-    1. Copy down the **URL** value. The format is `https://<your-storage-account>.blob.core.windows.net/sapbits`.
+1. Run the Ansible script **playbook_bom_download** with your own information.
+
+    - When asked if you have a storage account, enter `Y`.
+    - For `<username>`, use your SAP username.
+    - For `<password>`, use your SAP password. 
+	- For `<bom_base_name>`, use the SAP Version you want to install i.e. **_S41909SPS03_v0011ms_** or **_S42020SPS03_v0003ms_** or **_S4HANA_2021_ISS_v0001ms_**
+    - For `<storageAccountAccessKey>`, use your storage account's access key. To find the storage account's key:
 
-1. In the Azure CLI, when asked for the access key, enter your storage account's key. To find the storage account's key:
 
-    1. Find the storage account in the Azure portal.
+    1. Find the storage account in the Azure portal that you created.
 
     1. On the storage account's sidebar menu, select **Access keys** under **Security + networking**.
 
     1. For **key1**, select **Show key and connection string**.
 
     1. Copy the **Key** value.
-
-1. Once the script completes successfully, in the Azure portal, find the container named `sapbits` in the storage account that you created.
-
-1. Make sure the deployer VM packages are now visible in `sapbits`.
+        
+       - For `<containerBasePath>`, use the path to your `sapbits` container. To find the container path:
 
     1. Find the storage account that you created in the Azure portal.
 
     1. Find the container named `sapbits`.
 
-    1. On the **Overview** page for `sapbits`, look for a folder named **deployervmpackages**.
-
-### Download SAP media
-
-You can download the SAP installation media required to install the SAP software, using a script as described in this section.
-
-1. Sign in to the Ubuntu VM that you created in the [previous section](#download-supporting-software).
-
-1. Install Ansible 2.9.27 on the ubuntu VM 
-
-    ```bash
-    sudo pip3 install ansible==2.9.27
-    ```
-    
-1. Clone the SAP automation repository from GitHub.
-
-    ```azurecli
-    git clone https://github.com/Azure/sap-automation.git
-    ```
-
-1. Run the Ansible script **playbook_bom_download** with your own information.
+    1. On the container's sidebar menu, select **Properties** under **Settings**.
 
-    - For `<username>`, use your SAP username.
-    - For `<password>`, use your SAP password. 
-	- For `<bom_base_name>`, use the SAP Version you want to install i.e. **_S41909SPS03_v0011ms_** or **_S42020SPS03_v0003ms_** or **_S4HANA_2021_ISS_v0001ms_**
-    - For `<storageAccountAccessKey>`, use your storage account's access key. You found this value in the [previous section](#download-supporting-software). 
-    - For `<containerBasePath>`, use the path to your `sapbits` container. You found this value in the [previous section](#download-supporting-software). 
+    1. Copy down the **URL** value. The format is `https://<your-storage-account>.blob.core.windows.net/sapbits`.
       The format is `https://<your-storage-account>.blob.core.windows.net/sapbits`
+    
+    
+    - Ansible command to run
+      
 
 
     ```azurecli
@@ -346,14 +328,10 @@ To install the SAP software on Azure, use the ACSS installation wizard.
 
     1. For **BOM directory location**, select **Browse** and find the path to your BOM file. For example, `https://<your-storage-account>.blob.core.windows.net/sapbits/sapfiles/boms/S41909SPS03_v0010ms.yaml`.
 
-    1. For **SAP FQDN**, provide a fully qualified domain name (FQDN) for your SAP system. For example, `sap.contoso.com`.
-
-    1. For High Availability (HA) systems only, enter the client identifier for the Fencing Agent service principal for **Fencing client ID**.
+    1. For High Availability (HA) systems only, enter the client identifier for the STONITH Fencing Agent service principal for **Fencing client ID**.
 
     1. For High Availability (HA) systems only, enter the password for the Fencing Agent service principal for **Fencing client password**.
 
-    1. For **SSH private key**, provide the SSH private key that you created or selected as part of your infrastructure deployment.
-
     1. Select **Next**.
 
 1. On the **Review + install** tab, review the software settings. 
@@ -410,8 +388,9 @@ If you encounter this problem, follow these steps:
   
 - For `<username>`, use your SAP username.
 - For `<bom_base_name>`, use the SAP Version you want to install i.e. **_S41909SPS03_v0011ms_** or **_S42020SPS03_v0003ms_** or **_S4HANA_2021_ISS_v0001ms_**
-- For `<storageAccountAccessKey>`, use your storage account's access key. You found this value in the [previous section](#download-supporting-software). 
-- For `<containerBasePath>`, use the path to your `sapbits` container. You found this value in the [previous section](#download-supporting-software). 
+- For `<storageAccountAccessKey>`, use your storage account's access key. You found this value in the Download SAP media section
+- For `<containerBasePath>`, use the path to your `sapbits` container. You found this value in the Download SAP media section.
+
   The format is `https://<your-storage-account>.blob.core.windows.net/sapbits`
 
 This should resolve the problem and you can proceed with next steps as described in the section.