Merge pull request #183419 from KimForss/kimforss-devops

DevOps additions

Author: GitHubber17

articles/virtual-machines/workloads/sap/automation-configure-devops.md

@@ -296,13 +296,10 @@ Replace `<prefix>` with the name prefix of your environment, such as `DEV-WEEU-S
 The fencing agent details must be stored in the workload zone key vault using a predefined naming convention. Replace `<prefix>` with the name prefix of your environment, such as `DEV-WEEU-SAP01`, `<workload_kv_name>` with the name of the key vault from the workload zone resource group and for the other values use the values recorded from the previous step and run the script.
 
 
-```azurecli
-
-    ```azurecli-interactive
-    az keyvault secret set --name "<prefix>-fencing-spn-id" --vault-name "<workload_kv_name>" --value "<appId>";
-    az keyvault secret set --name "<prefix>-fencing-spn-pwd" --vault-name "<workload_kv_name>" --value "<password>";
-    az keyvault secret set --name "<prefix>-fencing-spn-tenant" --vault-name "<workload_kv_name>" --value "<tenant>";
-    ```
+```azurecli-interactive
+az keyvault secret set --name "<prefix>-fencing-spn-id" --vault-name "<workload_kv_name>" --value "<appId>";
+az keyvault secret set --name "<prefix>-fencing-spn-pwd" --vault-name "<workload_kv_name>" --value "<password>";
+az keyvault secret set --name "<prefix>-fencing-spn-tenant" --vault-name "<workload_kv_name>" --value "<tenant>";
 ```
 
 ## Next steps

articles/virtual-machines/workloads/sap/automation-configure-system.md

@@ -0,0 +1,145 @@
+---
+title: SAP deployment automation framework DevOps hands-on lab
+description: DevOps Hands-on lab for the SAP Deployment Automation Framework on Azure.
+author: mimergel
+ms.author: mimergel
+ms.reviewer: kimforss
+ms.date: 12/14/2021
+ms.topic: tutorial
+ms.service: virtual-machines-sap
+---
+
+# SAP Deployment Automation Framework DevOps - Hands-on lab
+
+This tutorial shows how to perform the deployment activities of the [SAP deployment automation framework on Azure](automation-deployment-framework.md) using Azure DevOps Services.
+
+You'll perform the following tasks during this lab:
+
+> [!div class="checklist"]
+> * Deploy the Control Plane (Deployer Infrastructure & Library)
+> * Deploy the Workload Zone (Landscape, System)
+> * Deploy the SAP Infrastructure
+> * Install HANA Database
+> * Install SCS server
+> * Load HANA Database
+> * Install Primary Application Server
+> * Download the SAP software
+> * Install SAP
+
+## Prerequisites
+
+- An Azure subscription. If you don't have an Azure subscription, you can [create a free account here](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
+
+- A configured Azure DevOps instance, follow the steps here [Configure Azure DevOps Services for SAP Deployment Automation](automation-configure-devops.md)
+
+- For the 'SAP software acquisition' and the 'Configuration and SAP installation' pipelines a configured self hosted agent, see [Configure a self-hosted agent for SAP Deployment Automation](automation-configure-devops.md#register-the-deployer-as-a-self-hosted-agent-for-azure-devops)
+
+> [!Note]
+> The free Azure account may not be sufficient to run the deployment.
+
+## Overview
+
+These steps reference and use the [default naming convention](automation-naming.md) for the automation framework. Example values are also used for naming throughout the configurations. In this tutorial, the following names are used:
+- Azure DevOps project name is `SAP-Deployment` 
+- Azure DevOps repository name is `sap-automation` 
+- The control plane environment is named `MGMT`, in the region West Europe (`WEEU`) and installed in the virtual network `DEP00`, giving a deployer configuration name: `MGMT-WEEU-DEP00-INFRASTRUCTURE`
+
+- The SAP workload zone has the environment name `DEV` and is in the same region as the control plane using the virtual network `SAP01`, giving the SAP workload zone configuration name: `DEV-WEEU-SAP01-INFRASTRUCTURE`
+- The SAP System with SID `X00` will be installed in this SAP workload zone. The configuration name for the SAP System: `DEV-WEEU-SAP01-X00`
+
+| Artifact type | Configuration name              | Location        |
+| ------------- | ------------------------------- | --------------- |
+| Control Plane | MGMT-WEEU-DEP00-INFRASTRUCTURE  | westeurope      |
+| Workload Zone | DEP-WEEU-SAP01-INFRASTRUCTURE   | westeurope      |
+| SAP System    | DEP-WEEU-SAP01-X00              | westeurope      |
+
+The deployed infrastructure is shown in the diagram below.
+
+ :::image type="content" source="media/automation-devops/automation-devops-tutorial-design.png" alt-text="Picture showing the DevOps tutorial infrastructure design":::
+
+
+> [!Note]
+> In this tutorial the X00 SAP system will be deployed with the following configuration:
+> * Standalone deployment
+> * HANA DB VM SKU: Standard_M32ts
+> * ASCS VM SKU: Standard_D4s_v3
+> * APP VM SKU: Standard_D4s_v3
+
+## Deploy the Control Plane
+
+The deployment will use the configuration defined in the Terraform variable files located in the 'samples/WORKSPACES/DEPLOYER/MGMT-WEEU-DEP00-INFRASTRUCTURE' and 'samples/WORKSPACES/LIBRARY/MGMT-WEEU-SAP_LIBRARY' folders. 
+
+Ensure that the 'Deployment_Configuration_Path' variable in the 'SDAF-General' variable group is set to 'samples/WORKSPACES'
+
+Run the pipeline by selecting the _Deploy control plane_ pipeline from the Pipelines section. Enter 'MGMT-WEEU-DEP00-INFRASTRUCTURE' as the Deployer configuration name and 'MGMT-WEEU-SAP_LIBRARY' as the SAP Library configuration name.
+
+:::image type="content" source="media/automation-devops/automation-run-pipeline.png" alt-text="Picture showing the DevOps tutorial run pipeline dialog":::
+
+You can track the progress in the Azure DevOps portal. Once the deployment is complete, you can see the Control Plane details in the _Extensions_ tab.
+
+ :::image type="content" source="media/automation-devops/automation-run-pipeline-control-plane.png" alt-text="Picture showing the DevOps tutorial run pipeline results":::
+
+## Deploy the Workload zone
+
+The deployment will use the configuration defined in the Terraform variable file located in the 'samples/WORKSPACES/LANDSCAPE/DEV-WEEU-SAP01-INFRASTRUCTURE' folder.
+
+Run the pipeline by selecting the _Deploy workload zone_ pipeline from the Pipelines section. Enter 'DEV-WEEU-SAP01-INFRASTRUCTURE' as the Workload zone configuration name and 'MGMT' as the Deployer Environment Name.
+
+You can track the progress in the Azure DevOps portal. Once the deployment is complete, you can see the Workload Zone details in the _Extensions_ tab.
+
+## Deploy the SAP System
+
+The deployment will use the configuration defined in the Terraform variable file located in the 'samples/WORKSPACES/SYSTEM/DEV-WEEU-SAP01-X00' folder.
+
+Run the pipeline by selecting the _SAP system deployment_ pipeline from the Pipelines section. Enter 'DEV-WEEU-SAP01-X00' as the SAP System configuration name.
+
+You can track the progress in the Azure DevOps portal. Once the deployment is complete, you can see the SAP System details in the _Extensions_ tab.
+
+## Download the SAP Software
+
+Run the pipeline by selecting the _SAP software acquisition_ pipeline from the Pipelines section. Enter 'S41909SPS03_v0010ms' as the Name of Bill of Materials (BoM), 'MGMT' as the Control Plane Environment name: MGMT and 'WEEU' as the
+Control Plane (SAP Library) location code.
+
+You can track the progress in the Azure DevOps portal. 
+
+## Run the Configuration and SAP Installation pipeline
+
+Run the pipeline by selecting the _Configuration and SAP installation_ pipeline from the Pipelines section. Enter 'DEV-WEEU-SAP01-X00' as the SAP System configuration name and 'S41909SPS03_v0010ms' as the Bill of Materials name.
+
+Choose the playbooks to execute.
+
+:::image type="content" source="media/automation-devops/automation-os-sap.png" alt-text="Picture showing the DevOps tutorial, OS and SAP configuration":::
+
+You can track the progress in the Azure DevOps portal. 
+
+## Run the Repository update pipeline
+
+Run the pipeline by selecting the _Repository updater_ pipeline from the Pipelines section. Enter 'https://github.com/Azure/sap-automation.git' as the Source repository and 'main' as the source branch to update from.
+
+Only choose 'Force the update' if the update fails.
+
+
+## Run the removal pipeline
+
+Run the pipeline by selecting the _Deployment removal_ pipeline from the Pipelines section.
+
+### SAP System removal
+
+Enter 'DEV-WEEU-SAP01-X00' as the SAP System configuration name.
+
+### SAP Workload Zone removal
+
+Enter 'DEV-WEEU-SAP01-INFRASTRUCTURE' as the SAP workload zone configuration name.
+
+### Control Plane removal
+
+Enter 'MGMT-WEEU-DEP00-INFRASTRUCTURE' as the Deployer configuration name and 'MGMT-WEEU-SAP_LIBRARY' as the 
+SAP Library configuration name.
+## Next step
+
+> [!div class="nextstepaction"]
+> [Configure Control Plane](automation-configure-control-plane.md)
+
+
+
+

articles/virtual-machines/workloads/sap/automation-devops-tutorial.md

@@ -15,7 +15,7 @@ ms.service: virtual-machines-sap
 
 This tutorial shows how to do enterprise scaling for deployments using the [SAP deployment automation framework on Azure](automation-deployment-framework.md). This example uses Azure Cloud Shell to deploy the control plane infrastructure. The deployer virtual machine (VM) creates the remaining infrastructure and SAP HANA configurations. 
 
-You will perform the following tasks during this lab:
+You'll perform the following tasks during this lab:
 
 > [!div class="checklist"]
 > * Deploy the Control Plane (Deployer Infrastructure & Library)
@@ -51,7 +51,7 @@ The SAP on Azure deployment automation framework has two main components:
 
 The following diagram shows the dependency between the control plane and the application plane.
 
-:::image type="content" source="./media/automation-deployment-framework/control-plane-sap-infrastructure.png" alt-text="Dependency between the control plane and the application plane":::
+ :::image type="content" source="media/automation-devops/automation-devops-tutorial-design.png" alt-text="DevOps tutorial infrastructure design":::
 
 The framework uses Terraform for infrastructure deployment, and Ansible for the operating system and application configuration. The following diagram shows the logical separation of the control plane and workload zone.
 
@@ -113,7 +113,7 @@ A valid SAP user account (SAP-User or S-User account) with software download pri
 
 1. Go to [Azure Cloud Shell](https://shell.azure.com)
 
-1. Log in to your Azure account.
+1. Sign in your Azure account.
 
     ```cloudshell-interactive
     az login
@@ -135,7 +135,7 @@ A valid SAP user account (SAP-User or S-User account) with software download pri
     az account list --output=table | grep True
     ```
 
-1. If required, change your active subscription.
+1. If necessary, change your active subscription.
   
     ```cloudshell-interactive
     az account set --subscription <Subscription ID>
@@ -147,6 +147,15 @@ A valid SAP user account (SAP-User or S-User account) with software download pri
     az account list --query "[?isDefault].{Name: name, CloudName: cloudName, SubscriptionId: id, State: state, IsDefault: isDefault}" --output=table
     ```
 
+1. Optionally remove all the deployment artifacts. Use when you want to remove all remnants of previous deployment artifacts.
+
+    ```cloudshell-interactive
+    
+    cd ~
+
+    rm -rf Azure_SAP_Automated_Deployment .sap_deployment_automation .terraform.d
+    ```
+
 1. Create the deployment folder and clone the repository.
 
     ```cloudshell-interactive
@@ -382,7 +391,7 @@ The sample SAP Library configuration file `MGMT-NOEU-SAP_LIBRARY.tfvars` is in t
 
 ## Connect to deployer VM
 
-After preparing the region, the Terraform state file moves to a remote backend, `azurerm`. All secrets for connecting to the deployer VM are available in a key vault within the deployer's resource group.
+After the control plane is deployed, the Terraform state is stored using a remote backend, `azurerm`. All secrets for connecting to the deployer VM are available in a key vault in the deployer's resource group.
 
 Make sure you can connect to your deployer VM:
 
@@ -417,7 +426,7 @@ Make sure you can connect to your deployer VM:
 
 ## Get SAP software using the Bill of Materials (BOM)
 
-The Automation Framework gives you tools to download software from SAP using the SAP Bill Of Materials (BOM). The software will be downloaded to the SAP library which acts as the archive for all media required to deploy SAP.
+The Automation Framework gives you tools to download software from SAP using the SAP Bill Of Materials (BOM). The software will be downloaded to the SAP library, which acts as the archive for all media required to deploy SAP.
 
 The SAP Bill of Materials (BOM) mimics the SAP maintenance planner. There are relevant product identifiers and a set of download URLs. 
 
@@ -514,7 +523,7 @@ For this example configuration, the resource group is `MGMT-NOEU-DEP00-INFRASTRU
 
     ```
 
-1. Replace `<Deployer KeyVault Name>` with the name of the deployer resource group key vault
+1. Replace `<Deployer KeyVault Name>` with the name of the deployer resource group Azure key vault
 
     Your file should look similar to the following example configuration:
 
@@ -572,11 +581,11 @@ For this example configuration, the resource group is `MGMT-NOEU-DEP00-INFRASTRU
 
 1. Additionally, the following piece of information needs to be collected.
 
-    1. The name of deployer state file, can be found under Library resource group
+    1. The name of deployer state file can be found under Library resource group
         - Library resource group -> state storage account -> containers -> tfstate -> Copy the **name** of the Deployer state file.
         - Following from the example above, the name of the blob will be: *MGMT-NOEU-DEP00-INFRASTRUCTURE.terraform.tfstate*
 
-1. If required, register the SPN
+1. If necessary, register the SPN
 
     > [!IMPORTANT]
     > The first time an Environment is instantiated, a SPN must be registered. In this tutorial the Control Plane is in the MGMT environment, and the Workload Zone is in DEV, therefore an SPN must be registered for DEV at this time.
@@ -612,7 +621,7 @@ For this example configuration, the resource group is `MGMT-NOEU-DEP00-INFRASTRU
     git pull
     ```
 
-1. Go into the *WORKSPACES/LANDSCAPE* folder and copy the sample configuration files that you will be using from from the repository.
+1. Go into the *WORKSPACES/LANDSCAPE* folder and copy the sample configuration files that you'll be using from the repository.
 
     ```bash
     cd ~/Azure_SAP_Automated_Deployment/WORKSPACES/LANDSCAPE
@@ -676,7 +685,7 @@ Use the [install_workloadzone](bash/automation-install_workloadzone.md) script t
 
 1. Connect to your deployer VM for the following steps. A copy of the repo is now there.
 
-1. Go into the *WORKSPACES/SYSTEM* folder and copy the sample configuration files that you will be using from from the repository.
+1. Go into the *WORKSPACES/SYSTEM* folder and copy the sample configuration files that you'll be using from the repository.
 
     ```bash
     cd ~/Azure_SAP_Automated_Deployment/WORKSPACES/SYSTEM
@@ -754,7 +763,7 @@ This playbook does the generic OS configuration setup on all the machines, which
 
 ### Playbook: SAP-Specific OS config
 
-This playbook does the SAP OS configuration setup on all the machines, which includes creation of volume groups, file systems, configuring of software repositories, packages, and services.
+This playbook does the SAP OS configuration setup on all the machines. The steps include creation of volume groups, file systems, configuring of software repositories, packages, and services.
 
 ### Playbook: BOM Processing
 
@@ -766,7 +775,7 @@ This playbook will install the HANA database instances.
 
 ### Playbook: SCS Install
   
-This playbook will install SAP Central Services. If, high availability is configured the playbook will also install the ERS instance and configure Pacemaker.
+This playbook will install SAP Central Services. For highly available configurations, the playbook will also install the SAP ERS instance and configure Pacemaker.
 
 ### Playbook: DB Load
 
@@ -778,7 +787,7 @@ This playbook will install the primary application server.
   
 ### Playbook: APP Install
 
-This playbook will install the additional application servers.
+This playbook will install the application servers.
 
 You've now deployed and configured a stand-alone HANA system, if you need to configure a highly available SAP HANA database run the HANA HA playbook
 
@@ -800,7 +809,7 @@ To remove the entire SAP infrastructure you deployed, you need to:
 
 Execute the removal of your SAP infrastructure resources and workload zones from the deployer VM. Execute the removal of the control plane from Cloud Shell.
 
-Before you begin, log in to your Azure account. Then, check that you're in the correct subscription.
+Before you begin, sign in your Azure account. Then, check that you're in the correct subscription.
 
 ### Remove SAP infrastructure