Skip to content

Commit edbf41f

Browse files
v-ccolinv-ccolin
authored
Merge pull request #207938 from KimForss/main
Small updates
2 parents fede5ad + b316a22 commit edbf41f

File tree

5 files changed

+81
-76
lines changed

5 files changed

+81
-76
lines changed

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,14 +145,16 @@ The table below defines the parameters used for defining the Virtual Machine aut
145145
The table below defines the parameters used for defining the Key Vault information
146146

147147
> [!div class="mx-tdCol2BreakAll "]
148-
> | Variable | Description | Type |
149-
> | ------------------------------------ | --------------------------------------------------------------------------- | ---------- |
150-
> | `user_keyvault_id` | Azure resource identifier for the user key vault | Optional |
151-
> | `spn_keyvault_id` | Azure resource identifier for the user key vault containing the SPN details | Optional |
152-
> | `deployer_private_key_secret_name` | The Azure Key Vault secret name for the deployer private key | Optional |
153-
> | `deployer_public_key_secret_name` | The Azure Key Vault secret name for the deployer public key | Optional |
154-
> | `deployer_username_secret_name` | The Azure Key Vault secret name for the deployer username | Optional |
155-
> | `deployer_password_secret_name` | The Azure Key Vault secret name for the deployer password | Optional |
148+
> | Variable | Description | Type |
149+
> | ------------------------------------------------ | --------------------------------------------------------------------------- | ---------- |
150+
> | `user_keyvault_id` | Azure resource identifier for the user key vault | Optional |
151+
> | `spn_keyvault_id` | Azure resource identifier for the user key vault containing the SPN details | Optional |
152+
> | `deployer_private_key_secret_name` | The Azure Key Vault secret name for the deployer private key | Optional |
153+
> | `deployer_public_key_secret_name` | The Azure Key Vault secret name for the deployer public key | Optional |
154+
> | `deployer_username_secret_name` | The Azure Key Vault secret name for the deployer username | Optional |
155+
> | `deployer_password_secret_name` | The Azure Key Vault secret name for the deployer password | Optional |
156+
> | `additional_users_to_add_to_keyvault_policies` | A list of user object IDs to add to the deployment KeyVault access policies | Optional |
157+
156158

157159
### Other parameters
158160

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ When prompted enter the application pool name, you created in the previous step.
410410
The agent will now be configured and started.
411411

412412

413-
## Deploy the web app
413+
## Deploy the Control Plane Web Application
414414

415415
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.
416416

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,14 @@ The table below contains the parameters that define the environment settings.
5252

5353

5454
> [!div class="mx-tdCol2BreakAll "]
55-
> | Variable | Description | Type | Notes |
56-
> | ----------------------- | -------------------------------------------------------- | ---------- | ------------------------------------------------------------------------------------------- |
57-
> | `environment` | Identifier for the workload zone (max 5 chars) | Mandatory | For example, `PROD` for a production environment and `NP` for a non-production environment. |
58-
> | `location` | The Azure region in which to deploy. | Required | |
59-
> | `custom_prefix` | Specifies the custom prefix used in the resource naming | Optional | |
60-
> | `use_prefix` | Controls if the resource naming includes the prefix | Optional | DEV-WEEU-SAP01-X00_xxxx |
61-
> | 'name_override_file' | Name override file | Optional | see [Custom naming](automation-naming-module.md) |
55+
> | Variable | Description | Type | Notes |
56+
> | ------------------------ | -------------------------------------------------------- | ---------- | ------------------------------------------------------------------------------------------- |
57+
> | `environment` | Identifier for the workload zone (max 5 chars) | Mandatory | For example, `PROD` for a production environment and `NP` for a non-production environment. |
58+
> | `location` | The Azure region in which to deploy. | Required | |
59+
> | `custom_prefix` | Specifies the custom prefix used in the resource naming | Optional | |
60+
> | `use_prefix` | Controls if the resource naming includes the prefix | Optional | DEV-WEEU-SAP01-X00_xxxx |
61+
> | 'name_override_file' | Name override file | Optional | see [Custom naming](automation-naming-module.md) |
62+
> | 'save_naming_information | Create a sample naming json file | Optional | see [Custom naming](automation-naming-module.md) |
6263
6364
## Resource group parameters
6465

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Overview of the SAP workload zone configuration process within the
44
author: kimforss
55
ms.author: kimforss
66
ms.reviewer: kimforss
7-
ms.date: 11/17/2021
7+
ms.date: 08/13/2022
88
ms.topic: conceptual
99
ms.service: virtual-machines-sap
1010
---
@@ -138,11 +138,11 @@ automation_username = "azureadm"
138138
The table below defines the parameters used for defining the Key Vault information
139139

140140
> [!div class="mx-tdCol2BreakAll "]
141-
> | Variable | Description | Type | Notes |
142-
> | ----------------------------------- | ------------------------------------------------------------------------------ | ------------ | ----------------------------------- |
143-
> | `user_keyvault_id` | Azure resource identifier for existing system credentials key vault | Optional | |
144-
> | `spn_keyvault_id` | Azure resource identifier for existing deployment credentials (SPNs) key vault | Optional | |
145-
> | `enable_purge_control_for_keyvaults | Disables the purge protection for Azure key vaults. | Optional | Only use this for test environments |
141+
> | Variable | Description | Type | Notes |
142+
> | ------------------------------------- | ------------------------------------------------------------------------------ | ------------ | ----------------------------------- |
143+
> | `user_keyvault_id` | Azure resource identifier for existing system credentials key vault | Optional | |
144+
> | `spn_keyvault_id` | Azure resource identifier for existing deployment credentials (SPNs) key vault | Optional | |
145+
> | `enable_purge_control_for_keyvaults` | Disables the purge protection for Azure key vaults. | Optional | Only use this for test environments |
146146
147147
## Private DNS
148148

@@ -245,7 +245,7 @@ ANF_service_level = "Ultra"
245245

246246
## Terraform Parameters
247247

248-
The table below contains the Terraform parameters. These parameters need to be entered manually if not using the deployment scripts.
248+
The table below contains the Terraform parameters. These parameters need to be entered manually if not using the deployment scripts.
249249

250250

251251
| Variable | Description | Type |
@@ -257,4 +257,4 @@ The table below contains the Terraform parameters. These parameters need to be
257257
## Next Step
258258

259259
> [!div class="nextstepaction"]
260-
> [About SAP system deployment in automation framework](automation-deploy-workload-zone.md)
260+
> [About SAP system deployment in automation framework](automation-deploy-workload-zone.md)

0 commit comments

Comments
 (0)