Acrolinc updates

KimForss · KimForss · commit 7ec1c56d7225 · 2022-02-11T01:29:01.000+02:00
diff --git a/articles/virtual-machines/workloads/sap/automation-configure-devops.md b/articles/virtual-machines/workloads/sap/automation-configure-devops.md
@@ -11,11 +11,11 @@ ms.service: virtual-machines-sap
 
 # Use SAP Deployment Automation Framework from Azure DevOps Services
 
-You can use Azure DevOps Services (Azure Repos and Azure Pipelines) as your configuration repository and as the deployment and configuration environment for the SAP Deployment Automation Framework. This page describes how you can set up Azure DevOps Services.
+You can use Azure Repos to store your configuration files and Azure Pipelines to deploy and configure the infrastructure and the SAP application. 
 
 ## Sign up for Azure DevOps Services
 
-To use Azure DevOps Services, you'll need an Azure DevOps organization. An organization is used to connect groups of related projects. Use your work or school account to automatically connect your organization to your Azure Active Directory (Azure AD). To create an account open [Azure DevOps](https://azure.microsoft.com/services/devops/) and either _sign-in_ or create a new account. Record the URL of the project.
+To use Azure DevOps Services, you'll need an Azure DevOps organization. An organization is used to connect groups of related projects. Use your work or school account to automatically connect your organization to your Azure Active Directory (Azure AD). To create an account, open [Azure DevOps](https://azure.microsoft.com/services/devops/) and either _sign-in_ or create a new account. Record the URL of the project.
 
 ## Create a new project
 
@@ -30,7 +30,7 @@ Open (https://dev.azure.com) and create a new project by clicking on the _New Pr
 
 Start by importing the SAP Deployment Automation Framework GitHub repository into Azure Repos. Navigate to the Repositories section and choose Import a repository. Import the 'https://github.com/Azure/sap-automation.git' repository into Azure DevOps. For more info, see [Import a repository](/azure/devops/repos/git/import-git-repository?view=azure-devops&preserve-view=true)
 
-Some of the pipelines will add files to the Azure Repos and therefore require pull permissions. Assign the permissions using Security tab of the source code repository in the Repositories section in Project settings. Assign "Contribute" permissions to the Build Service.
+Some of the pipelines will add files to the Azure Repos and therefore require pull permissions. Assign "Contribute" permissions to the 'Build Service' using the Security tab of the source code repository in the Repositories section in Project settings. 
 
 :::image type="content" source="./media/automation-devops/automation-repo-permissions.png" alt-text="Picture showing repository permissions":::
 
@@ -51,9 +51,9 @@ To create the service connection, go to Project settings and navigate to the Ser
 
 :::image type="content" source="./media/automation-devops/automation-create-service-connection.png" alt-text="Picture showing how to create a Service connection":::
 
-Choose _Azure Resource Manager_ as the service connection type and _Service principal (manual)_ as the authentication method. Specify the target subscription (typically the control plane subscription) and provide the service principal details (verify that they're valid using the _Verify_ button). If you don't have a service principal see [Creating a Service Principal](automation-deploy-control-plane.md#prepare-the-deployment-credentials) for more information.
+Choose _Azure Resource Manager_ as the service connection type and _Service principal (manual)_ as the authentication method. Enter the target subscription, typically the control plane subscription, and provide the service principal details (verify that they're valid using the _Verify_ button). For more information on how to create a service principal, see [Creating a Service Principal](automation-deploy-control-plane.md#prepare-the-deployment-credentials).
 
-Finally provide a Service connection name, for instance 'Connection to DEV subscription' and ensure that the _Grant access permission to all pipelines_ checkbox is checked. Select _Verify and save_ to save the service connection.
+Enter a Service connection name, for instance 'Connection to DEV subscription' and ensure that the _Grant access permission to all pipelines_ checkbox is checked. Select _Verify and save_ to save the service connection.
 
 ## Create Azure Pipelines
 
@@ -165,11 +165,11 @@ The pipelines use a custom task to perform cleanup activities post deployment. T
 
 ## Variable definitions
 
-The deployment pipelines are configured to use a set of predefined parameter values. I Azure DevOps these can be defined using variable groups.
+The deployment pipelines are configured to use a set of predefined parameter values. I Azure DevOps the variables are defined using variable groups.
 
 ### Common variables
 
-There are a set of common variables that are used by all the workload zones. These are stored in their own variable group 'SDAF-General'
+There's a set of common variables that are used by all the deployment pipelines. These variables are stored in a variable group called 'SDAF-General'.
 
 Create a new variable group 'SDAF-General' using the Library page in the Pipelines section. Add the following variables:
 
@@ -201,14 +201,14 @@ Create a new variable group 'SDAF-DEV' using the Library page in the Pipelines s
 | ARM_SUBSCRIPTION_ID   | Target subscription ID                         |                                                          |
 | ARM_TENANT_ID         | Tenant ID for service principal                |                                                          |
 | AZURE_CONNECTION_NAME | Previously created connection name             |                                                          |
-| sap_fqdn              | SAP Fully Qualified Domain Name, for example sap.contoso.net | Only needed if Private DNS is not used.                                           |
+| sap_fqdn              | SAP Fully Qualified Domain Name, for example sap.contoso.net | Only needed if Private DNS isn't used.                                           |
 
 
 Save the variables and assign permissions for all pipelines using _Pipeline permissions_.
 
 ## Register the Deployer as a self-hosted agent for Azure DevOps
 
-You must use the Deployer as a [self-hosted agent for Azure DevOps](/azure/devops/pipelines/agents/v2-linux) to perform the Ansible configuration activities. As a one-time step, you must register the Deployer as an self-hosted agent.
+You must use the Deployer as a [self-hosted agent for Azure DevOps](/azure/devops/pipelines/agents/v2-linux) to perform the Ansible configuration activities. As a one-time step, you must register the Deployer as a self-hosted agent.
 
 ### Prerequisites
 
diff --git a/articles/virtual-machines/workloads/sap/automation-devops-tutorial.md b/articles/virtual-machines/workloads/sap/automation-devops-tutorial.md
@@ -13,7 +13,7 @@ ms.service: virtual-machines-sap
 
 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 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)
@@ -44,8 +44,8 @@ These steps reference and use the [default naming convention](automation-naming.
 - 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`, leading to the SAP workload zone configuration name: `DEV-WEEU-SAP01-INFRASTRUCTURE`
-- The SAP System with SID `X00` will be installed in this SAP workload zone. This leads to the configuration name for the SAP System: `DEV-WEEU-SAP01-X00`
+- 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        |
 | ------------- | ------------------------------- | --------------- |
@@ -71,10 +71,7 @@ The deployment will use the configuration defined in the Terraform variable file
 
 Ensure that the 'Deployment_Configuration_Path' variable in the 'SDAF-General' variable group is set to 'samples/WORKSPACES'
 
-Run the pipeline by navigating to the Pipelines section in the [Azure DevOps Portal](https://dev.azure.com) and selecting the _Deploy control plane_ pipeline. Run the pipeline and when prompted enter the following values:
-
-Deployer configuration name: MGMT-WEEU-DEP00-INFRASTRUCTURE
-SAP Library configuration name: MGMT-WEEU-SAP_LIBRARY
+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":::
 
@@ -86,39 +83,28 @@ You can track the progress in the Azure DevOps portal. Once the deployment is co
 
 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 navigating to the Pipelines section in the [Azure DevOps Portal](https://dev.azure.com) and selecting the _Deploy workload zone_ pipeline. Run the pipeline and when prompted enter the following values:
-
-Workload zone configuration name: DEV-WEEU-SAP01-INFRASTRUCTURE
-Deployer Environment Name: MGMT
+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 navigating to the Pipelines section in the [Azure DevOps Portal](https://dev.azure.com) and selecting the _SAP system deployment_ pipeline. Run the pipeline and when prompted enter the following values:
-
-SAP System configuration name: DEV-WEEU-SAP01-X00
+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 navigating to the Pipelines section in the [Azure DevOps Portal](https://dev.azure.com) and selecting the _SAP software acquisition_ pipeline. Run the pipeline and when prompted enter the following values:
-
-Name of Bill of Materials (BoM): S41909SPS03_v0010ms
-Control Plane Environment name: MGMT
-Control Plane (SAP Library) location code: WEEU
+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 navigating to the Pipelines section in the [Azure DevOps Portal](https://dev.azure.com) and selecting the _Configuration and SAP installation_ pipeline. Run the pipeline and when prompted enter the following values:
-
-SAP System configuration name: DEV-WEEU-SAP01-X00
-Bill of Materials name: S41909SPS03_v0010ms
+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.
 
@@ -128,36 +114,27 @@ You can track the progress in the Azure DevOps portal.
 
 ## Run the Repository update pipeline
 
-Run the pipeline by navigating to the Pipelines section in the [Azure DevOps Portal](https://dev.azure.com) and selecting the _Repository updater_ pipeline. Run the pipeline and when prompted enter the following values:
-
-Source repository: https://github.com/Azure/sap-automation.git
-Source branch to update from: main
+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 navigating to the Pipelines section in the [Azure DevOps Portal](https://dev.azure.com) and selecting the _Deployment removal _ pipeline. Run the pipeline and select which deployment to remove.
+Run the pipeline by selecting the _Deployment removal_ pipeline from the Pipelines section.
 
 ### SAP System removal
 
-When prompted enter the following values:
-
-SAP System configuration name: DEV-WEEU-SAP01-X00
+Enter 'DEV-WEEU-SAP01-X00' as the SAP System configuration name.
 
 ### SAP Workload Zone removal
 
-When prompted enter the following values:
-
-SAP workload zone configuration name: DEV-WEEU-SAP01-INFRASTRUCTURE
+Enter 'DEV-WEEU-SAP01-INFRASTRUCTURE' as the SAP workload zone configuration name.
 
 ### Control Plane removal
 
-When prompted enter the following values:
-
-Deployer configuration name: MGMT-WEEU-DEP00-INFRASTRUCTURE
-SAP Library configuration name: MGMT-WEEU-SAP_LIBRARY
+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"]
diff --git a/articles/virtual-machines/workloads/sap/automation-tutorial.md b/articles/virtual-machines/workloads/sap/automation-tutorial.md
@@ -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
@@ -147,7 +147,7 @@ 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 this if you want to remove all remnants of previous deployment artifacts.
+1. Optionally remove all the deployment artifacts. Use when you want to remove all remnants of previous deployment artifacts.
 
     ```cloudshell-interactive
     
@@ -391,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:
 
@@ -523,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:
 
@@ -581,7 +581,7 @@ 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*
 
@@ -621,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'll 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
@@ -775,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
 
@@ -787,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
 
@@ -809,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
 
