You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardExpand all lines: articles/virtual-machines/workloads/sap/automation-configure-devops.md
+19-17Lines changed: 19 additions & 17 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -34,7 +34,7 @@ Start by importing the SAP Deployment Automation Framework GitHub repository int
34
34
35
35
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)
36
36
37
-
If you're unable to import a repository, you can create the 'sap-automation' repository and manually import the content from the SAP Deployment Automation Framework GitHub repository to it.
37
+
If you're unable to import a repository, you can create the 'sap-automation' repository, and manually import the content from the SAP Deployment Automation Framework GitHub repository to it.
38
38
39
39
### Create the repository for manual import
40
40
@@ -276,7 +276,7 @@ Create a new variable group 'SDAF-General' using the Library page in the Pipelin
276
276
|`POOL`|`<Agent Pool name>`| Use the Agent pool defined in the previous step. |
277
277
|`advice.detachedHead`| false ||
278
278
|`skipComponentGovernanceDetection`| true ||
279
-
|`tf_version`| 1.1.7| The Terraform version to use, see [Terraform download](https://www.terraform.io/downloads)|
279
+
|`tf_version`| 1.2.6| The Terraform version to use, see [Terraform download](https://www.terraform.io/downloads)|
280
280
281
281
Save the variables.
282
282
@@ -301,20 +301,22 @@ As each environment may have different deployment credentials you'll need to cre
301
301
302
302
Create a new variable group 'SDAF-MGMT' for the control plane environment using the Library page in the Pipelines section. Add the following variables:
| Agent | 'Azure Pipelines' or the name of the agent pool | Note, this pool will be created in a later step. |
307
+
| ARM_CLIENT_ID | Enter the Service principal application ID. ||
308
+
| ARM_CLIENT_SECRET | Enter the Service principal password. | Change variable type to secret by clicking the lock icon |
309
+
| ARM_SUBSCRIPTION_ID | Enter the target subscription ID. ||
310
+
| ARM_TENANT_ID | Enter the Tenant ID for the service principal. ||
311
+
| AZURE_CONNECTION_NAME | Previously created connection name. ||
312
+
| sap_fqdn | SAP Fully Qualified Domain Name, for example 'sap.contoso.net'. | Only needed if Private DNS isn't used. |
313
+
| FENCING_SPN_ID | Enter the service principal application ID for the fencing agent. | Required for highly available deployments. |
314
+
| FENCING_SPN_PWD | Enter the service principal password for the fencing agent. | Required for highly available deployments. |
315
+
| FENCING_SPN_TENANT | Enter the service principal tenant ID for the fencing agent. | Required for highly available deployments. |
316
+
|`PAT`|`<Personal Access Token>`| Use the Personal Token defined in the previous |
317
+
|`POOL`|`<Agent Pool name>`| Use the Agent pool defined in the previous |
318
+
| TF_VAR_app_registration_app_id | App registration application ID | Required if deploying the web app |
319
+
| TF_VAR_webapp_client_secret | App registration password | Required if deploying the web app |
318
320
319
321
Save the variables.
320
322
@@ -431,7 +433,7 @@ After updating the reply-urls, run the pipeline.
431
433
432
434
By default there will be no inbound public internet access to the web app apart from the deployer virtual network. To allow additional access to the web app, navigate to the Azure portal. In the deployer resource group, navigate to the app service resource. Then under settings on the left hand side, click on networking. From here, click Access restriction. Add any allow or deny rules you would like. For more information on configuring access restrictions, see [Set up Azure App Service access restrictions](https://docs.microsoft.com/en-us/azure/app-service/app-service-ip-restrictions).
433
435
434
-
You will also need to grant reader permissions to the app service system-assigned managed identity. Navgiate to the app service resource. On the left hand side, click "Identity". In the "system assigned" tab, click on "Azure role assignments" > "Add role assignment". Select "subscription" as the scope, and "reader" as the role. Then click save. Without this step, the web app dropdown functionality will not work.
436
+
You will also need to grant reader permissions to the app service system-assigned managed identity. Navgiate to the app service resource. On the left hand side, click "Identity". In the "system assigned" tab, click on "Azure role assignments" > "Add role assignment". Select "subscription" as the scope, and "reader" as the role. Then click save. Without this step, the web app dropdown functionality won't work.
435
437
436
438
You should now be able to visit the web app, and use it to deploy SAP workload zones and SAP system infrastructure.
Copy file name to clipboardExpand all lines: articles/virtual-machines/workloads/sap/automation-configure-webapp.md
+17-17Lines changed: 17 additions & 17 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -1,6 +1,6 @@
1
1
---
2
2
title: Configure a Deployer UX Web Application for SAP Deployment Automation Framework
3
-
description: Configure a web app as a part of the control plane to assist in creating and deploying SAP workload zones and systems on Azure.
3
+
description: Configure a web app as a part of the control plane to help creating and deploying SAP workload zones and systems on Azure.
4
4
author: wsheehan
5
5
ms.author: wsheehan
6
6
ms.reviewer: wsheehan
@@ -17,7 +17,7 @@ As a part of the SAP automation framework control plane, you can optionally crea
17
17
18
18
## Create an app registration
19
19
20
-
If you would like to use the web app, you must first create an app registration for authentication purposes. Open the Azure cloud shell and execute the following commands:
20
+
If you would like to use the web app, you must first create an app registration for authentication purposes. Open the Azure Cloud Shell and execute the following commands:
21
21
22
22
# [Linux](#tab/linux)
23
23
Replace MGMT with your environment as necessary.
@@ -57,11 +57,11 @@ rm ./manifest.json
57
57
```
58
58
---
59
59
60
-
## Deploy via Azure Devops (pipelines)
60
+
## Deploy via Azure DevOps (pipelines)
61
61
62
-
For full instructions on setting up the web app using Azure Devops, see [Use SAP Deployment Automation Framework from Azure DevOps Services](https://review.docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/automation-configure-devops?branch=main)
62
+
For full instructions on setting up the web app using Azure DevOps, see [Use SAP Deployment Automation Framework from Azure DevOps Services](https://review.docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/automation-configure-devops?branch=main)
63
63
64
-
### Summary of additional steps required to set up the web app before deploying the control plane:
64
+
### Summary of steps required to set up the web app before deploying the control plane:
65
65
1. Add the web app deployment pipeline (deploy/pipelines/21-deploy-web-app.yaml).
66
66
2. Add the variables TF_VAR_app_registration_app_id and TF_VAR_webapp_client_secret to your environment specific variable group before deployment.
67
67
3. Assign the administrator role to the build service using the Security tab in your environment specific variable group.
@@ -73,11 +73,11 @@ For full instructions on setting up the web app using Azure Devops, see [Use SAP
73
73
3. Run the web app deployment pipeline.
74
74
4. (Optionally) add an additional access policy to the app service.
75
75
76
-
## Deploy via Azure CLI (cloudshell)
76
+
## Deploy via Azure CLI (Cloud Shell)
77
77
78
78
For full instructions on setting up the web app using the Azure CLI, see [Deploy the control plane](https://review.docs.microsoft.com/en-us/azure/virtual-machines/workloads/sap/automation-deploy-control-plane?branch=main&tabs=linux)
79
79
80
-
### Summary of additional steps required to set up the web app before deploying the control plane:
80
+
### Summary of steps required to set up the web app before deploying the control plane:
81
81
1. Export the environment variables TF_VAR_app_registration_app_id, TF_VAR_webapp_client_secret, and TF_VAR_use_webapp="true".
82
82
83
83
### Summary of steps required to access the web app after deploying the control plane:
@@ -91,34 +91,34 @@ For full instructions on setting up the web app using the Azure CLI, see [Deploy
91
91
92
92
## Using the web app
93
93
94
-
The web app allows you to create SAP workload zone objects and system infrastructure objects. These are essentially another representation of a configuration file.
95
-
In the case of deploying using Azure Devops, you have ability to deploy these workload zones and system infrastructures right from the web app.
96
-
In the case of deploying using the Azure CLI, you can download the parameter file for any landscape or system object you create, and use that in your command line deployments.
94
+
The web app allows you to create SAP workload zone objects and system infrastructure objects. These are essentially another representation of the Terraform configuration file.
95
+
If deploying using Azure Pipelines, you have ability to deploy these workload zones and system infrastructures right from the web app.
96
+
If deploying using the Azure CLI, you can download the parameter file for any landscape or system object you create, and use that in your command line deployments.
97
97
98
98
### Creating a landscape or system object from scratch
99
99
1. Navigate to the "Workload zones" or "Systems" tab at the top of the website.
100
100
2. Click "Create New" in the bottom left corner.
101
101
3. Fill out the required parameters in the "Basic" and "Advanced" tabs, and any additional parameters you desire.
102
-
4. Certain parameters will be dropdowns populated with existing azure resources.
102
+
4. Certain parameters will be dropdowns populated with existing Azure resources.
103
103
* If no results are shown for a dropdown, you probably need to specify another dropdown before you can see any options. Or, see step 2 above regarding the system assigned managed identity.
104
104
- The subscription parameter must be specified before any other dropdown functionality is enabled
105
105
- The network_arm_id parameter must be specified before any subnet dropdown functionality is enabled
106
-
5.Click submit in the bottom left hand corner
106
+
5.Select submit in the bottom left hand corner
107
107
108
108
### Creating a workload zone or system object from a file
109
109
1. Navigate to the "File" tab at the top of the website.
110
110
2. Your options are
111
-
* Create a new file from scratch there in browser. It should be in the .tfvars file format. Click save.
112
-
* Import an existing.tfvars file, and (optionally) edit it before saving.
111
+
* Create a new file from scratch there in browser.
112
+
* Import an existing.tfvars file, and (optionally) edit it before saving.
113
113
* Use an existing template, and (optionally) edit it before saving.
114
114
3. Make sure your file conforms to the correct naming conventions.
115
115
4. Next to the file you would like to convert to a workload zone or system object, click "Convert".
116
116
5. The workload zone or system object will appear in its respective tab.
117
117
118
-
### Deploying a workload zone or system object (Azure Devops deployment)
118
+
### Deploying a workload zone or system object (Azure DevOps Pipelines deployment)
119
119
1. Navigate to the Workload zones or Systems tab.
120
120
2. Next to the workload zone or system you would like to deploy, click "Deploy".
121
121
* If you would like to deploy a file, first convert it to a workload zone or system object.
122
-
4. Specify the necessary parameters, and confirm it is the correct object.
122
+
4. Specify the necessary parameters, and confirm it's the correct object.
123
123
5. Click deploy.
124
-
6. The web app will automatically generate a .tfvars file from the object, update your Devops repository, and kick off the workload zone or system (infrastructure) pipeline. Monitor the deployment back in Azure Devops.
124
+
6. The web app will automatically generate a '.tfvars' file from the object, update your Azure DevOps repository, and kick off the workload zone or system (infrastructure) pipeline. You can monitor the deployment in the Azure DevOps Portal.
0 commit comments