Merge pull request #209517 from KimForss/main

prmerger-automator[bot] · web-flow · commit d12ca1f8a756 · 2022-08-29T18:44:50.000Z
DevOps update
diff --git a/articles/virtual-machines/workloads/sap/automation-configure-devops.md b/articles/virtual-machines/workloads/sap/automation-configure-devops.md
@@ -189,6 +189,18 @@ Create the SAP configuration and software installation pipeline by choosing _New
 
 Save the Pipeline, to see the Save option select the chevron next to the Run button. Navigate to the Pipelines section and select the pipeline. Rename the pipeline to 'SAP configuration and software installation' by choosing 'Rename/Move' from the three-dot menu on the right.
 
+## Configuration Web App pipeline
+
+Create the Configuration Web App pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipelines YAML File. Specify the pipeline with the following settings:
+
+| Setting | Value                                              |
+| ------- | -------------------------------------------------- |
+| Branch  | main                                               |
+| Path    | `deploy/pipelines/21-deploy-web-app.yaml` |
+| Name    | Configuration Web App                              |
+
+Save the Pipeline, to see the Save option select the chevron next to the Run button. Navigate to the Pipelines section and select the pipeline. Rename the pipeline to 'Configuration Web App' by choosing 'Rename/Move' from the three-dot menu on the right.
+
 ## Deployment removal pipeline
 
 Create the deployment removal pipeline by choosing _New Pipeline_ from the Pipelines section, select 'Azure Repos Git' as the source for your code. Configure your Pipeline to use an existing Azure Pipelines YAML File. Specify the pipeline with the following settings:
@@ -267,15 +279,10 @@ Create a new variable group 'SDAF-General' using the Library page in the Pipelin
 
 | Variable                           | Value                                   | Notes                                                                                       |
 | ---------------------------------- | --------------------------------------- | ------------------------------------------------------------------------------------------- |
-| `ANSIBLE_HOST_KEY_CHECKING`        | false                                   |                                                                                             |
 | Deployment_Configuration_Path      | WORKSPACES                              | For testing the sample configuration use 'samples/WORKSPACES' instead of WORKSPACES.        |
 | Branch                             | main                                    |                                                                                             |
 | S-Username                         | `<SAP Support user account name>`       |                                                                                             |
 | S-Password                         | `<SAP Support user password>`           | Change variable type to secret by clicking the lock icon.                                   |
-| `PAT`                              | `<Personal Access Token>`               | Use the Personal Token defined in the previous step.                                        |
-| `POOL`                             | `<Agent Pool name>`                     | Use the Agent pool defined in the previous step.                                            |
-| `advice.detachedHead`              | false                                   |                                                                                             |
-| `skipComponentGovernanceDetection` | true                                    |                                                                                             |
 | `tf_version`                       | 1.2.6                                   | The Terraform version to use, see [Terraform download](https://www.terraform.io/downloads)  |
 
 Save the variables.
@@ -347,20 +354,18 @@ Enter a Service connection name, for instance 'Connection to MGMT subscription'
 
 :::image type="content" source="./media/automation-devops/automation-repo-permissions.png" alt-text="Picture showing repository 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 a self-hosted agent.
-
-
 ## Deploy the Control Plane
 
 Newly created pipelines might not be visible in the default view. Select on recent tab and go back to All tab to view the new pipelines.
 
-Select the _Control plane deployment_ pipeline, provide the configuration names for the deployer and the SAP library and choose "Run" to deploy the control plane. Make sure to check "deploy the web app infrastructure" if you would like to set up the web app.
+Select the _Control plane deployment_ pipeline, provide the configuration names for the deployer and the SAP library and choose "Run" to deploy the control plane. Make sure to check ""Deploy the configuration web application" if you would like to set up the configuration web app.
 
-Wait for the deployment to finish.
 
-## Configure the Azure DevOps Services self-hosted agent
+### Configure the Azure DevOps Services self-hosted agent manually
+
+> [!NOTE] 
+>This is only needed if the Azure DevOps Services agent is not automatically configured. Please check that the agent pool is empty before proceeding.
+
 
 Connect to the deployer by following these steps:
 
@@ -414,7 +419,9 @@ The agent will now be configured and started.
 
 Checking the "deploy the web app infrastructure" parameter when running the Control plane deployment pipeline will provision the infrastructure necessary for hosting the web app. The "Deploy web app" pipeline will publish the application's software to that infrastructure. 
 
-Before running the Deploy web app pipeline, first update the reply-url values for the app registration. As a result of running the SAP workload zone deployment pipeline, part of the web app URL needed will be stored in a variable named "WEBAPP_URL_BASE" in your environment-specific variable group. Copy this value, and use it in the following command:
+Wait for the deployment to finish. Once the deployment is complete, navigate to the Extensions tab and follow the instructions to finalize the configuration and update the reply-url values for the app registration. 
+
+As a result of running the SAP workload zone deployment pipeline, part of the web app URL needed will be stored in a variable named "WEBAPP_URL_BASE" in your environment-specific variable group. Copy this value, and use it in the following command:
 
 # [Linux](#tab/linux)
 
diff --git a/articles/virtual-machines/workloads/sap/automation-devops-tutorial.md b/articles/virtual-machines/workloads/sap/automation-devops-tutorial.md
@@ -37,7 +37,7 @@ You'll perform the following tasks during this lab:
 
 - 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)
+- For the 'SAP software acquisition' and the 'Configuration and SAP installation' pipelines a configured self hosted agent.
 
 > [!Note]
 > The self hosted agent virtual machine will be deployed as part of the control plane deployment.
diff --git a/articles/virtual-machines/workloads/sap/automation-plan-deployment.md b/articles/virtual-machines/workloads/sap/automation-plan-deployment.md
@@ -161,6 +161,7 @@ You'll be creating or granting access to the following services in each workload
 * Azure Virtual Networks, for virtual networks, subnets and network security groups.
 * Azure Key Vault, for system credentials and the deployment Service Principal.
 * Azure Storage accounts, for Boot Diagnostics and Cloud Witness.
+* Shared storage for the SAP Systems either Azure Files or Azure NetApp Files.
 
 Before you design your workload zone layout, consider the following questions:
 
@@ -197,20 +198,23 @@ When planning a deployment, it's important to consider the overall flow. There a
     1. Creating the deployment environment
     1. Creating shared storage for Terraform state files
     1. Creating shared storage for SAP installation media
-1. Preparing the workload zone. This step deploys the [workload zone components](#workload-zone-structure), such as the virtual network and key vaults.
-1. Deploying the system. This step includes the [infrastructure for the SAP system](#sap-system-setup).
+
+1. Deploy the workload zone. This step deploys the [workload zone components](#workload-zone-structure), such as the virtual network and key vaults.
+
+1. Deploy the system. This step includes the [infrastructure for the SAP system](#sap-system-setup) deployment and the SAP configuration [configuration and SAP installation](automation-run-ansible.md).
 
 ## Orchestration environment
 
 For the automation framework, you must execute templates and scripts from one of the following supported environments:
 
-* Azure Cloud Shell
+* Azure DevOps
 * An Azure-hosted Linux VM
+* Azure Cloud Shell
 * PowerShell on your local Windows computer
 
 ## Naming conventions
 
-The automation framework uses a default naming convention. If you'd like to use a custom naming convention, plan and define your custom names before deployment.
+The automation framework uses a default naming convention. If you'd like to use a custom naming convention, plan and define your custom names before deployment. For more information, see [how to configure the naming convention](automation-naming-module.md). 
 
 ## Disk sizing
 
