Skip to content

Commit 301f239

Browse files
committed
edit pass: sap-automation-batch1
1 parent 85b986b commit 301f239

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

articles/sap/automation/configure-devops.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Run the script and follow the instructions. The script opens browser windows for
9393

9494
You can choose to either run the code directly from GitHub or you can import a copy of the code into your Azure DevOps project.
9595

96-
To confirm that the project was created, go to the Azure DevOps portal and select the project. Ensure that the repo is populated and that the pipelines were created.
96+
To confirm that the project was created, go to the Azure DevOps portal and select the project. Ensure that the repo was populated and that the pipelines were created.
9797

9898
> [!IMPORTANT]
9999
> Run the following steps on your local workstation. Also ensure that you have the latest Azure CLI installed by running the `az upgrade` command.
@@ -215,7 +215,7 @@ To create the service connection, go to **Project Settings** and under the **Pip
215215

216216
:::image type="content" source="./media/devops/automation-create-service-connection.png" alt-text="Screenshot that shows how to create a service connection for GitHub.":::
217217

218-
Select **GitHub** as the service connection type. Select **Azure Pipelines** in the **OAuth Configuration**dropdown.
218+
Select **GitHub** as the service connection type. Select **Azure Pipelines** in the **OAuth Configuration** dropdown.
219219

220220
Select **Authorize** to sign in to GitHub.
221221

@@ -227,7 +227,7 @@ The automation framework optionally provisions a web app as a part of the contro
227227

228228
# [Linux](#tab/linux)
229229

230-
Replace `MGMT` with your environment as necessary.
230+
Replace `MGMT` with your environment, as necessary.
231231

232232
```bash
233233
echo '[{"resourceAppId":"00000003-0000-0000-c000-000000000000","resourceAccess":[{"id":"e1fe6dd8-ba31-4d61-89e7-88639da4683d","type":"Scope"}]}]' >> manifest.json
@@ -243,7 +243,7 @@ rm manifest.json
243243

244244
# [Windows](#tab/windows)
245245

246-
Replace `MGMT` with your environment as necessary.
246+
Replace `MGMT` with your environment, as necessary.
247247

248248
```powershell
249249
Add-Content -Path manifest.json -Value '[{"resourceAppId":"00000003-0000-0000-c000-000000000000","resourceAccess":[{"id":"e1fe6dd8-ba31-4d61-89e7-88639da4683d","type":"Scope"}]}]'
@@ -387,15 +387,15 @@ The pipelines use a custom task to perform cleanup activities post deployment. Y
387387

388388
## Preparations for a self-hosted agent
389389

390-
1. Create an Agent Pool by going to **Organizational Settings** and under the **Pipelines** section, selecting **Agent Pools**. Select **Add Pool** and select **Self-hosted** as the pool type. Name the pool to align with the control plane environment. For example, use `MGMT-WEEU-POOL`. Ensure that **Grant access permission to all pipelines** is selected and use **Create** to create the pool.
390+
1. Create an agent pool by going to **Organizational Settings**. Under the **Pipelines** section, select **Agent Pools** > **Add Pool**. Select **Self-hosted** as the pool type. Name the pool to align with the control plane environment. For example, use `MGMT-WEEU-POOL`. Ensure that **Grant access permission to all pipelines** is selected and select **Create** to create the pool.
391391

392392
1. Sign in with the user account you plan to use in your [Azure DevOps](https://dev.azure.com) organization.
393393

394394
1. From your home page, open your user settings and select **Personal access tokens**.
395395

396-
:::image type="content" source="./media/devops/automation-select-personal-access-tokens.jpg" alt-text="Diagram that shows the creation of the Personal Access Token (PAT).":::
396+
:::image type="content" source="./media/devops/automation-select-personal-access-tokens.jpg" alt-text="Diagram that shows the creation of a personal access token.":::
397397

398-
1. Create a personal access token. Use these settings:
398+
1. Create a personal access token with these settings:
399399

400400
- **Agent Pools**: Select **Read & manage**.
401401
- **Build**: Select **Read & execute**.
@@ -404,7 +404,7 @@ The pipelines use a custom task to perform cleanup activities post deployment. Y
404404

405405
Write down the created token value.
406406

407-
:::image type="content" source="./media/devops/automation-new-pat.png" alt-text="Diagram that shows the attributes of the Personal Access Token (PAT).":::
407+
:::image type="content" source="./media/devops/automation-new-pat.png" alt-text="Diagram that shows the attributes of the personal access token.":::
408408

409409
## Variable definitions
410410

@@ -422,7 +422,7 @@ Create a new variable group named `SDAF-General` by using the **Library** page i
422422
| Branch | main | |
423423
| S-Username | `<SAP Support user account name>` | |
424424
| S-Password | `<SAP Support user password>` | Change the variable type to secret by selecting the lock icon. |
425-
| `tf_version` | 1.3.0 | The Terraform version to use. See [Terraform download](https://www.terraform.io/downloads) |
425+
| `tf_version` | 1.3.0 | The Terraform version to use. See [Terraform download](https://www.terraform.io/downloads). |
426426

427427
Save the variables.
428428

@@ -459,14 +459,14 @@ Create a new variable group named `SDAF-MGMT` for the control plane environment
459459
| FENCING_SPN_ID | `Service principal application ID` for the fencing agent | Required for highly available deployments that use a service principal for the fencing agent. |
460460
| FENCING_SPN_PWD | `Service principal password` for the fencing agent | Required for highly available deployments that use a service principal for the fencing agent. |
461461
| FENCING_SPN_TENANT | `Service principal tenant ID` for the fencing agent | Required for highly available deployments that use a service principal for the fencing agent. |
462-
| PAT | `<Personal Access Token>` | Use the Personal Token defined in the previous step. |
463-
| POOL | `<Agent Pool name>` | The Agent pool to use for this environment. |
462+
| PAT | `<Personal Access Token>` | Use the personal token defined in the previous step. |
463+
| POOL | `<Agent Pool name>` | The agent pool to use for this environment. |
464464
| | | |
465465
| APP_REGISTRATION_APP_ID | `App registration application ID` | Required if deploying the web app. |
466466
| WEB_APP_CLIENT_SECRET | `App registration password` | Required if deploying the web app. |
467467
| | | |
468-
| SDAF_GENERAL_GROUP_ID | The group ID for the SDAF-General group | The ID can be retrieved from the URL parameter `variableGroupId` when accessing the variable group by using a browser. For example: `variableGroupId=8` |
469-
| WORKLOADZONE_PIPELINE_ID | The ID for the `SAP workload zone deployment` pipeline | The ID can be retrieved from the URL parameter `definitionId` from the pipeline page in Azure DevOps. For example: `definitionId=31` |
468+
| SDAF_GENERAL_GROUP_ID | The group ID for the SDAF-General group | The ID can be retrieved from the URL parameter `variableGroupId` when accessing the variable group by using a browser. For example: `variableGroupId=8`. |
469+
| WORKLOADZONE_PIPELINE_ID | The ID for the `SAP workload zone deployment` pipeline | The ID can be retrieved from the URL parameter `definitionId` from the pipeline page in Azure DevOps. For example: `definitionId=31`. |
470470
| SYSTEM_PIPELINE_ID | The ID for the `SAP system deployment (infrastructure)` pipeline | The ID can be retrieved from the URL parameter `definitionId` from the pipeline page in Azure DevOps. For example: `definitionId=32`. |
471471

472472
Save the variables.
@@ -481,17 +481,17 @@ You can use the clone functionality to create the next environment variable grou
481481

482482
To remove the Azure resources, you need an Azure Resource Manager service connection. For more information, see [Manage service connections](/azure/devops/pipelines/library/service-endpoints?view=azure-devops&preserve-view=true).
483483

484-
To create the service connection, go to **Project settings** and go to the **Service connections** setting in the **Pipelines** section.
484+
To create the service connection, go to **Project Settings**. Under the **Pipelines** section, select **Service connections**.
485485

486-
:::image type="content" source="./media/devops/automation-create-service-connection.png" alt-text="Screenshot that shows how to create a Service connection.":::
486+
:::image type="content" source="./media/devops/automation-create-service-connection.png" alt-text="Screenshot that shows how to create a service connection.":::
487487

488-
Select **Azure Resource Manager** as the service connection type and **Service principal (manual)** as the authentication method. Enter the target subscription, which is typically the control plane subscription. Enter the service principal details. Validate the credentials by selecting **Verify**. For more information on how to create a service principal, see [Create a service principal](deploy-control-plane.md#prepare-the-deployment-credentials).
488+
Select **Azure Resource Manager** as the service connection type and **Service principal (manual)** as the authentication method. Enter the target subscription, which is typically the control plane subscription. Enter the service principal details. Select **Verify** to validate the credentials. For more information on how to create a service principal, see [Create a service principal](deploy-control-plane.md#prepare-the-deployment-credentials).
489489

490-
Enter a **Service connection name**, for instance, use `Connection to MGMT subscription`. Ensure that the **Grant access permission to all pipelines** checkbox is selectd. Select **Verify and save** to save the service connection.
490+
Enter a **Service connection name**, for instance, use `Connection to MGMT subscription`. Ensure that the **Grant access permission to all pipelines** checkbox is selected. Select **Verify and save** to save the service connection.
491491

492492
## Permissions
493493

494-
Most of the pipelines add files to the Azure Repos and therefore require pull permissions. Assign Contribute permissions to the `Build Service` by using the **Security** tab of the source code repository in the **Repositories** section in **Project settings**.
494+
Most of the pipelines add files to the Azure repos and therefore require pull permissions. On **Project Settings**, under the **Repositories** section, select the **Security** tab of the source code repository and assign Contribute permissions to the `Build Service`.
495495

496496
:::image type="content" source="./media/devops/automation-repo-permissions.png" alt-text="Screenshot that shows repository permissions.":::
497497

@@ -539,25 +539,25 @@ cd sap-automation/deploy/scripts
539539
./configure_deployer.sh
540540
```
541541

542-
Reboot the deployer and reconnect and run the following script to set up the Azure DevOps agent.
542+
Reboot the deployer, reconnect, and run the following script to set up the Azure DevOps agent:
543543

544544
```bash
545545
cd ~/Azure_SAP_Automated_Deployment/
546546

547547
$DEPLOYMENT_REPO_PATH/deploy/scripts/setup_ado.sh
548548
```
549549

550-
Accept the license and, when you're prompted for the server URL, enter the URL you captured when you created the Azure DevOps project. For authentication, choose **PAT** and enter the token value from the previous step.
550+
Accept the license and, when you're prompted for the server URL, enter the URL you captured when you created the Azure DevOps project. For authentication, select **PAT** and enter the token value from the previous step.
551551

552552
When prompted, enter the application pool name that you created in the previous step. Accept the default agent name and the default work folder name. The agent is now configured and starts.
553553

554554
## Deploy the control plane web application
555555

556556
Selecting the `deploy the web app infrastructure` parameter when you run the control plane deployment pipeline provisions the infrastructure necessary for hosting the web app. The **Deploy web app** pipeline publishes the application's software to that infrastructure.
557557

558-
Wait for the deployment to finish. Then go to the **Extensions** tab and follow the instructions to finalize the configuration. Update the `reply-url` values for the app registration.
558+
Wait for the deployment to finish. Select the **Extensions** tab and follow the instructions to finalize the configuration. Update the `reply-url` values for the app registration.
559559

560-
As a result of running the control plane pipeline, part of the web app URL needed is stored in a variable named `WEBAPP_URL_BASE` in your environment-specific variable group. At any time, you can update the URLs of the registered application web app by using the following command.
560+
As a result of running the control plane pipeline, part of the web app URL that's needed is stored in a variable named `WEBAPP_URL_BASE` in your environment-specific variable group. At any time, you can update the URLs of the registered application web app by using the following command.
561561

562562
# [Linux](#tab/linux)
563563

@@ -580,4 +580,4 @@ You should now be able to visit the web app and use it to deploy SAP workload zo
580580
## Next step
581581

582582
> [!div class="nextstepaction"]
583-
> [DevOps hands-on lab](devops-tutorial.md)
583+
> [Azure DevOps hands-on lab](devops-tutorial.md)

0 commit comments

Comments
 (0)