Merge pull request #223057 from KimForss/main

DevOps structure

Author: v-shils

articles/virtual-machines/workloads/sap/automation-get-started.md

@@ -4,7 +4,7 @@ description: Quickly get started with the SAP on Azure Deployment Automation Fra
 author: kimforss
 ms.author: kimforss
 ms.reviewer: kimforss
-ms.date: 11/17/2021
+ms.date: 1/2/2023
 ms.topic: how-to
 ms.service: virtual-machines-sap
 ---
@@ -17,9 +17,10 @@ Get started quickly with the [SAP on Azure Deployment Automation Framework](auto
 
 
 - An Azure subscription. If you don't have an Azure subscription, you can [create a free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
-- A [download of the SAP software](automation-software.md) in your Azure environment.
+- Ability to [download of the SAP software](automation-software.md) in your Azure environment.
 - A [Terraform](https://www.terraform.io/) installation. For more information, also see the [Terraform on Azure documentation](/azure/developer/terraform/).
 - An [Azure CLI](/cli/azure/install-azure-cli) installation on your local computer.
+- A Service Principal to use for the control plane deployment
 - Optionally, if you want to use PowerShell:
     - An [Azure PowerShell](/powershell/azure/install-az-ps#update-the-azure-powershell-module) installation on your local computer.
     - The latest PowerShell modules. [Update the PowerShell module](/powershell/azure/install-az-ps#update-the-azure-powershell-module) if needed.
@@ -29,67 +30,34 @@ Some of the prerequisites may already be installed in your deployment environmen
 
 Clone the repository and prepare the execution environment by using the following steps:
 
-1. Create a directory called `Azure_SAP_Automated_Deployment` for your automation framework deployment. 
-
-# [Linux](#tab/linux)
-
-```bash
-mkdir ~/Azure_SAP_Automated_Deployment; cd $_
-git clone https://github.com/Azure/sap-automation.git 
-```
-
-Prepare the environment using the following steps:
+- Create a directory called `Azure_SAP_Automated_Deployment` for your automation framework deployment. 
 
 ```bash
-export DEPLOYMENT_REPO_PATH=~/Azure_SAP_Automated_Deployment/sap-automation
-export ARM_SUBSCRIPTION_ID=<subscriptionID>
-```
-> [!NOTE]
-> Be sure to replace the sample value `<subscriptionID>` with your information.
-
-# [Windows](#tab/windows)
+mkdir ~/Azure_SAP_Automated_Deployment/config; cd $_
+git clone https://github.com/Azure/sap-automation-bootstrap.git 
 
-```powershell
-mkdir C:\Azure_SAP_Automated_Deployment
-    
-cd Azure_SAP_Automated_Deployment
-    
+mkdir ~/Azure_SAP_Automated_Deployment/sap-automation; cd $_
 git clone https://github.com/Azure/sap-automation.git 
-```
-
-Import the PowerShell module
 
-```powershell
-Import-Module C:\Azure_SAP_Automated_Deployment\sap-automation\deploy\scripts\pwsh\SAPDeploymentUtilities\Output\SAPDeploymentUtilities\SAPDeploymentUtilities.psd1
+mkdir ~/Azure_SAP_Automated_Deployment/samples; cd $_
+git clone https://github.com/Azure/sap-automation-samples.git 
 ```
 
----
 
 > [!TIP]
-> The deployer already clones [SAP on Azure Deployment Automation Framework repository](https://github.com/Azure/sap-automation). 
+> The deployer already clones the required repositories. 
 
-## Copy the samples
+## Samples
 
-The repo contains a set of sample configuration files to start testing the deployment automation framework. You can copy them using the following steps.
+The ~/Azure_SAP_Automated_Deployment/samples folder contains a set of sample configuration files to start testing the deployment automation framework. You can copy them using the following steps.
 
-# [Linux](#tab/linux)
 
 ```bash
 cd ~/Azure_SAP_Automated_Deployment
 
-cp -Rp sap-automation/samples/WORKSPACES WORKSPACES
-```
-# [Windows](#tab/windows)
-
-```powershell
-cd C:\Azure_SAP_Automated_Deployment
-mkdir WORKSPACES
-
-xcopy /E sap-automation\samples\WORKSPACES WORKSPACES
+cp -Rp samples/Terraform/WORKSPACES config/WORKSPACES
 ```
 
----
-
 
 ## Next step
 

articles/virtual-machines/workloads/sap/automation-plan-deployment.md

@@ -198,16 +198,20 @@ The following table shows the required permissions for the service principal:
 
 ## DevOps structure
 
-The Terraform automation templates are in the [SAP on Azure Deployment Automation Framework repository](https://github.com/Azure/sap-automation/). For most use cases, consider this repository as read-only and don't modify it.
+The deployment framework uses three separate repositories for the deployment artifacts. For your own parameter files, it's a best practice to keep these files in a source control repository that you manage. 
 
-For your own parameter files, it's a best practice to keep these files in a source control repository that you manage. You can clone the [SAP on Azure Deployment Automation Framework bootstrap repository](https://github.com/Azure/sap-automation-bootstrap/) into your source control repository.
+### Main repository
+
+This repository contains the Terraform parameter files and the files needed for the Ansible playbooks for all the workload zone and system deployments. 
+
+You can create this repository by cloning the [SAP on Azure Deployment Automation Framework bootstrap repository](https://github.com/Azure/sap-automation-bootstrap/) into your source control repository.
 
 > [!IMPORTANT]
-> Your parameter file's name becomes the name of the Terraform state file. Make sure to use a unique parameter file name for this reason.
+> This repository must be the default repository for your Azure DevOps project.
 
-### Folder structure
+#### Folder structure
 
-The following sample folder hierarchy shows how to structure your configuration files along with the automation framework files. The first top-level folder, called **sap-automation**, has the automation framework files that you don't need to change in most use cases. The second top-level folder, called **WORKSPACES**, contains subfolders with configuration files for your deployment settings.
+The following sample folder hierarchy shows how to structure your configuration files along with the automation framework files.
 
 | Folder name | Contents | Description |
 | ----------- | -------- | ----------- |
@@ -220,6 +224,28 @@ The following sample folder hierarchy shows how to structure your configuration
 
 :::image type="content" source="./media/automation-plan-deployment/folder-structure.png" alt-text="Screenshot of example folder structure, showing separate folders for SAP HANA and multiple workload environments.":::
 
+> [!IMPORTANT]
+> Your parameter file's name becomes the name of the Terraform state file. Make sure to use a unique parameter file name for this reason.
+
+### Code repository
+
+This repository contains the Terraform automation templates and the Ansible playbooks as well as the deployment pipelines and scripts. For most use cases, consider this repository as read-only and don't modify it.
+
+You can create this repository by cloning the [SAP on Azure Deployment Automation Framework repository](https://github.com/Azure/sap-automation/) into your source control repository.
+
+> [!IMPORTANT]
+> This repository should be named 'sap-automation'.
+
+### Sample repository
+
+This repository contains the sample Bill of Materials files and the sample Terraform configuration files.
+
+You can create this repository by cloning the [SAP on Azure Deployment Automation Framework samples repository](https://github.com/Azure/sap-automation-samples/) into your source control repository.
+
+> [!IMPORTANT]
+> This repository should be named 'samples'.
+
+
 ## Supported deployment scenarios
 
 The automation framework supports [deployment into both new and existing scenarios](automation-new-vs-existing.md).