Skip to content

Commit 60a4b48

Browse files
Maggiemouse1Maggiemouse1
authored
Merge pull request #198887 from KimForss/main
Misc updates
2 parents b248760 + 93eed2c commit 60a4b48

10 files changed

+568
-356
lines changed

‎articles/virtual-machines/workloads/sap/automation-configure-control-plane.md

Lines changed: 97 additions & 54 deletions
Large diffs are not rendered by default.

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

Lines changed: 54 additions & 43 deletions
Large diffs are not rendered by default.

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

Lines changed: 101 additions & 78 deletions
Large diffs are not rendered by default.

‎articles/virtual-machines/workloads/sap/automation-configure-workload-zone.md

Lines changed: 145 additions & 78 deletions
Large diffs are not rendered by default.

‎articles/virtual-machines/workloads/sap/automation-deploy-control-plane.md

Lines changed: 43 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ The control plane deployment for the [SAP deployment automation framework on Azu
2121

2222
The SAP Deployment Frameworks uses Service Principals when doing the deployments. You can create the Service Principal for the Control Plane deployment using the following steps using an account with permissions to create Service Principals:
2323

24-
2524
```azurecli
2625
az ad sp create-for-rbac --role="Contributor" --scopes="/subscriptions/<subscriptionID>" --name="<environment>-Deployment-Account"
2726
@@ -60,27 +59,33 @@ cp -Rp sap-automation/samples/WORKSPACES WORKSPACES
6059

6160
```
6261

62+
Run the following command to deploy the control plane:
63+
6364
```bash
64-
cd ~/Azure_SAP_Automated_Deployment/WORKSPACES
6565

6666
az logout
6767
az login
68-
export DEPLOYMENT_REPO_PATH=~/Azure_SAP_Automated_Deployment/sap-automation
69-
export ARM_SUBSCRIPTION_ID=<subscriptionID>
70-
export subscriptionID=<subscriptionID>
71-
export spn_id=<appID>
72-
export spn_secret=<password>
73-
export tenant_id=<tenant>
74-
export region_code=WEEU
75-
76-
${DEPLOYMENT_REPO_PATH}/deploy/scripts/prepare_region.sh \
77-
--deployer_parameter_file DEPLOYER/MGMT-${region_code}-DEP00-INFRASTRUCTURE/MGMT-${region_code}-DEP00-INFRASTRUCTURE.tfvars \
78-
--library_parameter_file LIBRARY/MGMT-${region_code}-SAP_LIBRARY/MGMT-${region_code}-SAP_LIBRARY.tfvars \
79-
--subscription $subscriptionID \
80-
--spn_id "${spn_id}" \
81-
--spn_secret "${spn_secret}" \
82-
--tenant_id "${tenant_id}"
83-
```
68+
cd ~/Azure_SAP_Automated_Deployment/WORKSPACES
69+
70+
export subscriptionId="<subscriptionId>"
71+
export spn_id="<appId>"
72+
export spn_secret="<password>"
73+
export tenant_id="<tenantId>"
74+
export env_code="MGMT"
75+
export region_code="<region_code>"
76+
77+
export DEPLOYMENT_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
78+
export ARM_SUBSCRIPTION_ID="${subscriptionId}"
79+
80+
${DEPLOYMENT_REPO_PATH}/deploy/scripts/prepare_region.sh \
81+
--deployer_parameter_file DEPLOYER/${env_code}-${region_code}-DEP00-INFRASTRUCTURE/${env_code}-${region_code}-DEP00-INFRASTRUCTURE.tfvars \
82+
--library_parameter_file LIBRARY/${env_code}-${region_code}-SAP_LIBRARY/${env_code}-${region_code}-SAP_LIBRARY.tfvars \
83+
--subscription "${subscriptionId}" \
84+
--spn_id "${spn_id}" \
85+
--spn_secret "${spn_secret}" \
86+
--tenant_id "${tenant_id}" \
87+
--auto-approve
88+
```
8489

8590
# [Windows](#tab/windows)
8691

@@ -108,13 +113,31 @@ cd C:\Azure_SAP_Automated_Deployment\WORKSPACES
108113
109114
New-SAPAutomationRegion -DeployerParameterfile .\DEPLOYER\MGMT-WEEU-DEP00-INFRASTRUCTURE\MGMT-WEEU-DEP00-INFRASTRUCTURE.tfvars -LibraryParameterfile .\LIBRARY\MGMT-WEEU-SAP_LIBRARY\MGMT-WEEU-SAP_LIBRARY.tfvars -Subscription $subscription -SPN_id $appId -SPN_password $spn_secret -Tenant_id $tenant_id
110115
```
111-
---
116+
112117

113118

114119
> [!NOTE]
115120
> Be sure to replace the sample value `<subscriptionID>` with your subscription ID.
116121
> Replace the `<appID>`, `<password>`, `<tenant>` values with the output values of the SPN creation
117122

123+
# [Azure DevOps](#tab/devops)
124+
125+
Open (https://dev.azure.com) and and go to your Azure DevOps project.
126+
127+
> [!NOTE]
128+
> Ensure that the 'Deployment_Configuration_Path' variable in the 'SDAF-General' variable group is set to the folder that contains your configuration files, for this example you can use 'samples/WORKSPACES'.
129+
130+
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.
131+
132+
Run the pipeline by selecting the _Deploy control plane_ pipeline from the Pipelines section. Enter the configuration names for the deployer and the SAP library. Use 'MGMT-WEEU-DEP00-INFRASTRUCTURE' as the Deployer configuration name and 'MGMT-WEEU-SAP_LIBRARY' as the SAP Library configuration name.
133+
134+
:::image type="content" source="media/automation-devops/automation-run-pipeline.png" alt-text="Screenshot of Azure DevOps run pipeline dialog.":::
135+
136+
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.
137+
138+
:::image type="content" source="media/automation-devops/automation-run-pipeline-control-plane.png" alt-text="Screenshot of the run Azure DevOps pipeline run results.":::
139+
140+
---
118141

119142
### Manually configure the deployer using Azure Bastion
120143

@@ -154,9 +177,7 @@ cd sap-automation/deploy/scripts
154177

155178
The script will install Terraform and Ansible and configure the deployer.
156179

157-
### Manually configure the deployer (deployments without public IP)
158-
159-
If you deploy the deployer without a public IP Terraform isn't able to configure the deployer Virtual Machine as it will not be able to connect to it.
180+
### Manually configure the deployer
160181

161182
> [!NOTE]
162183
>You need to connect to the deployer virtual Machine from a computer that is able to reach the Azure Virtual Network

‎articles/virtual-machines/workloads/sap/automation-deploy-system.md

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,11 +161,24 @@ New-SAPSystem -Parameterfile DEV-WEEU-SAP01-X01.tfvars
161161
-Type sap_system
162162
```
163163

164+
# [Azure DevOps](#tab/devops)
165+
166+
Open (https://dev.azure.com) and go to your Azure DevOps Services project.
167+
168+
> [!NOTE]
169+
> Ensure that the 'Deployment_Configuration_Path' variable in the 'SDAF-General' variable group is set to the folder that contains your configuration files, for this example you can use 'samples/WORKSPACES'.
170+
171+
The deployment will use the configuration defined in the Terraform variable file located in the 'samples/WORKSPACES/SYSTEM/DEV-WEEU-SAP01-X00' folder.
172+
173+
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.
174+
175+
You can track the progress in the Azure DevOps Services portal. Once the deployment is complete, you can see the SAP System details in the _Extensions_ tab.
176+
164177
---
165178

166179
### Output files
167180

168-
The deployment will create a Ansible hosts file (`SID_hosts.yaml`) and an Ansible parameter file (`sap-parameters.yaml`) that are required input for the Ansible playbooks.
181+
The deployment will create an Ansible hosts file (`SID_hosts.yaml`) and an Ansible parameter file (`sap-parameters.yaml`) that are required input for the Ansible playbooks.
169182
## Next steps
170183

171184
> [!div class="nextstepaction"]

‎articles/virtual-machines/workloads/sap/automation-deploy-workload-zone.md

Lines changed: 36 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ environment="DEV"
4040
# The location value is a mandatory field, it is used to control where the resources are deployed
4141
location="westeurope"
4242

43-
# The network logical name is mandatory - it is used in the naming convention and should map to the workload virtual network logical name
43+
# The network logical name is mandatory - it is used in the naming convention and should map to the workload virtual network logical name
4444
network_name="SAP01"
4545

4646
# network_address_space is a mandatory parameter when an existing Virtual network is not used
@@ -67,7 +67,7 @@ The SAP Deployment Frameworks uses Service Principals when doing the deployment.
6767

6868
```azurecli-interactive
6969
az ad sp create-for-rbac --role="Contributor" --scopes="/subscriptions/<subscriptionID>" --name="<environment>-Deployment-Account"
70-
70+
7171
```
7272

7373
> [!IMPORTANT]
@@ -78,7 +78,7 @@ az ad sp create-for-rbac --role="Contributor" --scopes="/subscriptions/<subscrip
7878
> - password
7979
> - tenant
8080
81-
Assign the correct permissions to the Service Principal:
81+
Assign the correct permissions to the Service Principal:
8282

8383
```azurecli
8484
az role assignment create --assignee <appId> \
@@ -87,7 +87,7 @@ az role assignment create --assignee <appId> \
8787
```
8888

8989
## Deploying the SAP Workload zone
90-
90+
9191
The sample Workload Zone configuration file `DEV-WEEU-SAP01-INFRASTRUCTURE.tfvars` is located in the `~/Azure_SAP_Automated_Deployment/samples/WORKSPACES/LANDSCAPE/DEV-WEEU-SAP01-INFRASTRUCTURE` folder.
9292

9393
Running the command below will deploy the SAP Workload Zone.
@@ -109,29 +109,24 @@ cp -R sap-automation/samples/WORKSPACES WORKSPACES
109109

110110
```bash
111111

112-
export subscriptionID="<subscriptionID>"
113-
export spn_id="<appID>"
114-
export spn_secret="<password>"
115-
export tenant_id="<tenant>"
116-
export region_code="WEEU"
117-
export storageaccount="<storageaccount>"
118-
export keyvault="<keyvault>"
112+
export subscriptionId="<subscriptionId>"
113+
export spn_id="<appId>"
114+
export spn_secret="<password>"
115+
export tenant_id="<tenantId>"
116+
export env_code="MGMT"
117+
export region_code="<region_code>"
119118

120119
export DEPLOYMENT_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
121-
export ARM_SUBSCRIPTION_ID="${subscriptionID}"
122-
123-
cd ~/Azure_SAP_Automated_Deployment/WORKSPACES/LANDSCAPE/DEV-${region_code}-SAP01-INFRASTRUCTURE
124-
125-
${DEPLOYMENT_REPO_PATH}/deploy/scripts/install_workloadzone.sh \
126-
--parameterfile ./DEV-${region_code}-SAP01-INFRASTRUCTURE.tfvars \
127-
--deployer_environment MGMT \
128-
--deployer_tfstate_key MGMT-${region_code}-DEP00-INFRASTRUCTURE.terraform.tfstate \
129-
--subscription "${subscriptionID}" \
130-
--spn_id "${spn_id}" \
131-
--spn_secret "${spn_secret}" \
132-
--tenant_id "${tenant_id}" \
133-
--keyvault "${keyvault}" \
134-
--storageaccountname "${storageaccount}"
120+
export ARM_SUBSCRIPTION_ID="${subscriptionId}"
121+
122+
${DEPLOYMENT_REPO_PATH}/deploy/scripts/prepare_region.sh \
123+
--deployer_parameter_file DEPLOYER/${env_code}-${region_code}-DEP00-INFRASTRUCTURE/${env_code}-${region_code}-DEP00-INFRASTRUCTURE.tfvars \
124+
--library_parameter_file LIBRARY/${env_code}-${region_code}-SAP_LIBRARY/${env_code}-${region_code}-SAP_LIBRARY.tfvars \
125+
--subscription "${subscriptionId}" \
126+
--spn_id "${spn_id}" \
127+
--spn_secret "${spn_secret}" \
128+
--tenant_id "${tenant_id}" \
129+
--auto-approve
135130
```
136131
# [Windows](#tab/windows)
137132

@@ -158,7 +153,7 @@ $region_code="WEEU"
158153
159154
cd C:\Azure_SAP_Automated_Deployment\WORKSPACES\LANDSCAPE\DEV-$region_code-SAP01-INFRASTRUCTURE
160155
161-
New-SAPWorkloadZone -Parameterfile DEV-$region_code-SAP01-INFRASTRUCTURE.tfvars
156+
New-SAPWorkloadZone -Parameterfile DEV-$region_code-SAP01-INFRASTRUCTURE.tfvars
162157
-Subscription $subscription -SPN_id $spn_id -SPN_password $spn_secret -Tenant_id $tenant_id
163158
-State_subscription $statefile_subscription -Vault $keyvault -$StorageAccountName $storageaccount
164159
```
@@ -172,12 +167,26 @@ New-SAPWorkloadZone -Parameterfile DEV-$region_code-SAP01-INFRASTRUCTURE.tfvars
172167
> Replace `<storageaccount>` with the name of the storage account containing the Terraform state files
173168
> Replace `<statefile_subscription>` with the subscription ID for the storage account containing the Terraform state files
174169
170+
# [Azure DevOps](#tab/devops)
171+
172+
Open (https://dev.azure.com) and go to your Azure DevOps Services project.
173+
174+
> [!NOTE]
175+
> Ensure that the 'Deployment_Configuration_Path' variable in the 'SDAF-General' variable group is set to the folder that contains your configuration files, for this example you can use 'samples/WORKSPACES'.
176+
177+
The deployment will use the configuration defined in the Terraform variable file located in the 'samples/WORKSPACES/LANDSCAPE/DEV-WEEU-SAP01-INFRASTRUCTURE' folder.
178+
179+
Run the pipeline by selecting the _Deploy workload zone_ pipeline from the Pipelines section. Enter the workload zone configuration name and the deployer environment name. Use 'DEV-WEEU-SAP01-INFRASTRUCTURE' as the Workload zone configuration name and 'MGMT' as the Deployer Environment Name.
180+
181+
You can track the progress in the Azure DevOps Services portal. Once the deployment is complete, you can see the Workload Zone details in the _Extensions_ tab.
182+
175183
---
176184

185+
177186
> [!TIP]
178187
> If the scripts fail to run, it can sometimes help to clear the local cache files by removing `~/.sap_deployment_automation/` and `~/.terraform.d/` directories before running the scripts again.
179188
180-
## Next step
189+
## Next steps
181190

182191
> [!div class="nextstepaction"]
183192
> [About SAP system deployment in automation framework](automation-configure-system.md)

0 commit comments

Comments
 (0)