Merge pull request #248437 from KimForss/main

CLI Steps update

Author: v-regandowner

articles/sap/automation/deploy-control-plane.md

@@ -114,26 +114,23 @@ Run the following command to deploy the control plane:
 
 ```bash
 
-az logout
-cd ~/Azure_SAP_Automated_Deployment
-cp -Rp samples/Terraform/WORKSPACES config
-cd config/WORKSPACES
-
 export ARM_SUBSCRIPTION_ID="<subscriptionId>"
 export       ARM_CLIENT_ID="<appId>"
 export   ARM_CLIENT_SECRET="<password>"
 export       ARM_TENANT_ID="<tenantId>"
 export            env_code="MGMT"
 export         region_code="WEEU"
-export           vnet_code="WEEU"
+export           vnet_code="DEP01"
+
+export DEPLOYMENT_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
+export CONFIG_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/WORKSPACES"
+export SAP_AUTOMATION_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
 
+az logout
 az login --service-principal -u "${ARM_CLIENT_ID}" -p="${ARM_CLIENT_SECRET}" --tenant "${ARM_TENANT_ID}"
 
 
-export DEPLOYMENT_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
-="${subscriptionId}"
-export CONFIG_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/config/WORKSPACES"
-export SAP_AUTOMATION_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
+cd ~/Azure_SAP_Automated_Deployment/WORKSPACES
 
 
 sudo ${SAP_AUTOMATION_REPO_PATH}/deploy/scripts/deploy_controlplane.sh                                                                                                            \
@@ -142,8 +139,7 @@ sudo ${SAP_AUTOMATION_REPO_PATH}/deploy/scripts/deploy_controlplane.sh
     --subscription "${ARM_SUBSCRIPTION_ID}"                                                                                                                                       \
     --spn_id "${ARM_CLIENT_ID}"                                                                                                                                                   \
     --spn_secret "${ARM_CLIENT_SECRET}"                                                                                                                                           \
-    --tenant_id "${ARM_TENANT_ID}"                                                                                                                                                \
-    --auto-approve
+    --tenant_id "${ARM_TENANT_ID}"
 ```
 
 

articles/sap/automation/deploy-workload-zone.md

@@ -121,13 +121,14 @@ export          region_code="<region_code>"
 export            vnet_code="SAP02"
 export deployer_environment="MGMT"
 
-az login --service-principal -u "${ARM_CLIENT_ID}" -p="${ARM_CLIENT_SECRET}" --tenant "${ARM_TENANT_ID}"
-
 
 export DEPLOYMENT_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
 export CONFIG_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/config/WORKSPACES"
 export SAP_AUTOMATION_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
 
+az login --service-principal -u "${ARM_CLIENT_ID}" -p="${ARM_CLIENT_SECRET}" --tenant "${ARM_TENANT_ID}"
+
+
 cd "${CONFIG_REPO_PATH}/LANDSCAPE/${env_code}-${region_code}-${vnet_code}-INFRASTRUCTURE"
 parameterFile="${env_code}-${region_code}-${vnet_code}-INFRASTRUCTURE.tfvars"
 
@@ -137,8 +138,7 @@ $SAP_AUTOMATION_REPO_PATH/deploy/scripts/install_workloadzone.sh   \
     --subscription "${ARM_SUBSCRIPTION_ID}"                        \
     --spn_id "${ARM_CLIENT_ID}"                                    \
     --spn_secret "${ARM_CLIENT_SECRET}"                            \
-    --tenant_id "${ARM_TENANT_ID}"                                 \
-    --auto-approve 
+    --tenant_id "${ARM_TENANT_ID}"
 
 ```
 # [Windows](#tab/windows)

articles/sap/automation/get-started.md

@@ -41,36 +41,39 @@ Follow the guidance here [Configure Azure DevOps for SDAF](configure-devops.md)
 
 You can run the SAP on Azure Deployment Automation Framework from a virtual machine in Azure. The following steps describe how to create the environment.
 
-Clone the repository and prepare the execution environment by using the following steps on a Linux Virtual machine in Azure:
+> [!IMPORTANT]
+> Ensure that the virtual machine is using either a system assigned or user assigned identity with permissions on the subscription to create resources.
+
 
 Ensure the Virtual Machine has the following prerequisites installed:
+
  - git
  - jq
  - unzip
+ - virtualenv (if running on Ubuntu)
 
-Ensure that the virtual machine is using either a system assigned or user assigned identity with permissions on the subscription to create resources.
 
-
-- Create a directory called `Azure_SAP_Automated_Deployment` for your automation framework deployment. 
+You can install the prerequisites on an Ubuntu Virtual Machine by using the following command:
 
 ```bash
-mkdir -p ~/Azure_SAP_Automated_Deployment; cd $_
+sudo apt-get install -y git jq unzip virtualenv
 
-git clone https://github.com/Azure/sap-automation.git sap-automation
+```
 
-git clone https://github.com/Azure/sap-automation-samples.git samples
+You can then install the deployer components using the following commands:
 
-git clone https://github.com/Azure/sap-automation-bootstrap.git config
+```bash
 
-cd sap-automation/deploy/scripts
-    
+wget https://raw.githubusercontent.com/Azure/sap-automation/main/deploy/scripts/configure_deployer.sh -O configure_deployer.sh	
+chmod +x ./configure_deployer.sh
 ./configure_deployer.sh
-```
 
+# Source the new variables
 
+. /etc/profile.d/deploy_server.sh
+
+```
 
-> [!TIP]
-> The deployer already clones the required repositories. 
 
 ## Samples
 
@@ -80,7 +83,7 @@ The ~/Azure_SAP_Automated_Deployment/samples folder contains a set of sample con
 ```bash
 cd ~/Azure_SAP_Automated_Deployment
 
-cp -Rp samples/Terraform/WORKSPACES config
+cp -Rp samples/Terraform/WORKSPACES ~/Azure_SAP_Automated_Deployment
 ```