Skip to content

Commit d347adf

Browse files
Stacyrch140Stacyrch140
authored
Merge pull request #222448 from KimForss/main
Planning updates
2 parents c2cac51 + a840c61 commit d347adf

File tree

3 files changed

+185
-134
lines changed

3 files changed

+185
-134
lines changed

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

Lines changed: 64 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Configure your deployment control plane for the SAP on Azure Deploy
44
author: kimforss
55
ms.author: kimforss
66
ms.reviewer: kimforss
7-
ms.date: 8/8/2022
7+
ms.date: 12/28/2022
88
ms.topic: conceptual
99
ms.service: virtual-machines-sap
1010
---
@@ -19,13 +19,13 @@ The control plane for the [SAP on Azure Deployment Automation Framework](automat
1919

2020
## Deployer
2121

22-
The [deployer](automation-deployment-framework.md#deployment-components) is the execution engine of the [SAP automation framework](automation-deployment-framework.md). It's a pre-configured virtual machine (VM) that is used for executing Terraform and Ansible commands.
22+
The [deployer](automation-deployment-framework.md#deployment-components) is the execution engine of the [SAP automation framework](automation-deployment-framework.md). It's a pre-configured virtual machine (VM) that is used for executing Terraform and Ansible commands. When using Azure DevOps the deployer is a self-hosted agent.
2323

2424
The configuration of the deployer is performed in a Terraform tfvars variable file.
2525

2626
## Terraform Parameters
2727

28-
The table below contains the Terraform parameters, these parameters need to be entered manually if not using the deployment scripts
28+
This table shows the Terraform parameters, these parameters need to be entered manually if not using the deployment scripts
2929

3030
> [!div class="mx-tdCol2BreakAll "]
3131
> | Variable | Description | Type |
@@ -35,7 +35,7 @@ The table below contains the Terraform parameters, these parameters need to be
3535

3636
### Environment Parameters
3737

38-
The table below contains the parameters that define the resource naming.
38+
This table shows the parameters that define the resource naming.
3939

4040
> [!div class="mx-tdCol2BreakAll "]
4141
> | Variable | Description | Type | Notes |
@@ -46,7 +46,7 @@ The table below contains the parameters that define the resource naming.
4646
4747
### Resource Group
4848

49-
The table below contains the parameters that define the resource group.
49+
This table shows the parameters that define the resource group.
5050

5151
> [!div class="mx-tdCol2BreakAll "]
5252
> | Variable | Description | Type |
@@ -67,7 +67,7 @@ The recommended CIDR of the virtual network address space is /27, which allows s
6767
The recommended CIDR value for the management subnet is /28 that allows 16 IP addresses.
6868
The recommended CIDR value for the firewall subnet is /26 that allows 64 IP addresses.
6969

70-
The table below contains the networking parameters.
70+
This table shows the networking parameters.
7171

7272
> [!div class="mx-tdCol2BreakAll "]
7373
> | Variable | Description | Type | Notes |
@@ -99,7 +99,7 @@ The table below contains the networking parameters.
9999

100100
### Deployer Virtual Machine Parameters
101101

102-
The table below contains the parameters related to the deployer virtual machine.
102+
This table shows the parameters related to the deployer virtual machine.
103103

104104
> [!div class="mx-tdCol2BreakAll "]
105105
> | Variable | Description | Type |
@@ -124,21 +124,13 @@ The Virtual Machine image is defined using the following structure:
124124
"offer" = "0001-com-ubuntu-server-focal"
125125
"sku" = "20_04-lts"
126126
"version" = "latest"
127+
"type" = "marketplace"
127128
}
128129
```
129130

130-
The plan defined using the following structure:
131-
```python
132-
{
133-
"use" = false
134-
"name" = "0001-com-ubuntu-server-focal"
135-
"publisher" = "Canonical"
136-
"product" = "20_04-lts"
137-
}
138-
```
139-
140131
> [!NOTE]
141-
> Note that using the plan attribute will require that the image in question has been used at least once in the subscription. This is because the first usage prompts the user to accept the License terms and the automation has no mean to approve it.
132+
> type can be marketplace/marketplace_with_plan/custom
133+
> Note that using a image of type 'marketplace_with_plan' will require that the image in question has been used at least once in the subscription. This is because the first usage prompts the user to accept the License terms and the automation has no mean to approve it.
142134
143135

144136

@@ -161,27 +153,40 @@ The table below defines the parameters used for defining the Virtual Machine aut
161153
The table below defines the parameters used for defining the Key Vault information
162154

163155
> [!div class="mx-tdCol2BreakAll "]
164-
> | Variable | Description | Type |
165-
> | ------------------------------------------------ | --------------------------------------------------------------------------- | ---------- |
166-
> | `user_keyvault_id` | Azure resource identifier for the user key vault | Optional |
167-
> | `spn_keyvault_id` | Azure resource identifier for the user key vault containing the SPN details | Optional |
168-
> | `deployer_private_key_secret_name` | The Azure Key Vault secret name for the deployer private key | Optional |
169-
> | `deployer_public_key_secret_name` | The Azure Key Vault secret name for the deployer public key | Optional |
170-
> | `deployer_username_secret_name` | The Azure Key Vault secret name for the deployer username | Optional |
171-
> | `deployer_password_secret_name` | The Azure Key Vault secret name for the deployer password | Optional |
172-
> | `additional_users_to_add_to_keyvault_policies` | A list of user object IDs to add to the deployment KeyVault access policies | Optional |
156+
> | Variable | Description | Type |
157+
> | ------------------------------------------------ | --------------------------------------------------------------------------------- | ---------- |
158+
> | `user_keyvault_id` | Azure resource identifier for the user key vault | Optional |
159+
> | `spn_keyvault_id` | Azure resource identifier for the key vault containing the deployment credentials | Optional |
160+
> | `deployer_private_key_secret_name` | The Azure Key Vault secret name for the deployer private key | Optional |
161+
> | `deployer_public_key_secret_name` | The Azure Key Vault secret name for the deployer public key | Optional |
162+
> | `deployer_username_secret_name` | The Azure Key Vault secret name for the deployer username | Optional |
163+
> | `deployer_password_secret_name` | The Azure Key Vault secret name for the deployer password | Optional |
164+
> | `additional_users_to_add_to_keyvault_policies` | A list of user object IDs to add to the deployment KeyVault access policies | Optional |
165+
166+
167+
### DNS Support
168+
169+
170+
> [!div class="mx-tdCol2BreakAll "]
171+
> | Variable | Description | Type |
172+
> | ----------------------------------- | -------------------------------------------------------------------- | -------- |
173+
> | `use_custom_dns_a_registration` | Use an existing Private DNS zone | Optional |
174+
> | `management_dns_subscription_id` | Subscription ID for the subscription containing the Private DNS Zone | Optional |
175+
> | `management_dns_resourcegroup_name` | Resource group containing the Private DNS Zone | Optional |
176+
> | `dns_label` | DNS name of the private DNS zone | Optional |
173177
174178

175179
### Other parameters
176180

177181
> [!div class="mx-tdCol2BreakAll "]
178-
> | Variable | Description | Type | Notes |
179-
> | ------------------------------------ | ---------------------------------------------------------------------- | ----------- | ----------------------------- |
180-
> | `firewall_deployment` | Boolean flag controlling if an Azure firewall is to be deployed | Optional | |
181-
> | `bastion_deployment` | Boolean flag controlling if Azure Bastion host is to be deployed | Optional | |
182-
> | `enable_purge_control_for_keyvaults` | Boolean flag controlling if purge control is enabled on the Key Vault. | Optional | Use only for test deployments |
183-
> | `use_private_endpoint` | Are private endpoints created for storage accounts and key vaults. | Optional | |
184-
> | `use_service_endpoint` | Are service endpoints defined for the subnets. | Optional | |
182+
> | Variable | Description | Type | Notes |
183+
> | -------------------------------------------- | ---------------------------------------------------------------------- | ----------- | ----------------------------- |
184+
> | `firewall_deployment` | Boolean flag controlling if an Azure firewall is to be deployed | Optional | |
185+
> | `bastion_deployment` | Boolean flag controlling if Azure Bastion host is to be deployed | Optional | |
186+
> | `enable_purge_control_for_keyvaults` | Boolean flag controlling if purge control is enabled on the Key Vault. | Optional | Use only for test deployments |
187+
> | `use_private_endpoint` | Use private endpoints | Optional |
188+
> | `use_service_endpoint` | Use service endpoints for subnets | Optional |
189+
> | `enable_firewall_for_keyvaults_and_storage` | Restrict access to selected subnets | Optional |
185190
186191
### Example parameters file for deployer (required parameters only)
187192

@@ -220,16 +225,16 @@ The configuration of the SAP Library is performed in a Terraform tfvars variable
220225

221226
### Terraform Parameters
222227

223-
The table below contains the Terraform parameters, these parameters need to be entered manually when not using the deployment scripts
228+
This table shows the Terraform parameters, these parameters need to be entered manually when not using the deployment scripts
224229

225230
> [!div class="mx-tdCol2BreakAll "]
226-
> | Variable | Description | Type |
227-
> | ----------------------- | ------------------------------------- | ---------- |
228-
> | `deployer_tfstate_key` | The state file name for the deployer | Required |
231+
> | Variable | Description | Type | Notes |
232+
> | ----------------------- | ------------------------------------- | ---------- | ----- |
233+
> | `deployer_tfstate_key` | The state file name for the deployer | Required |
229234
230235
### Environment Parameters
231236

232-
The table below contains the parameters that define the resource naming.
237+
This table shows the parameters that define the resource naming.
233238

234239
> [!div class="mx-tdCol2BreakAll "]
235240
> | Variable | Description | Type | Notes |
@@ -240,7 +245,7 @@ The table below contains the parameters that define the resource naming.
240245
241246
### Resource Group
242247

243-
The table below contains the parameters that define the resource group.
248+
This table shows the parameters that define the resource group.
244249

245250
> [!div class="mx-tdCol2BreakAll "]
246251
> | Variable | Description | Type |
@@ -250,8 +255,6 @@ The table below contains the parameters that define the resource group.
250255
> | `resourcegroup_tags` | Tags to be associated with the resource group | Optional |
251256
252257

253-
254-
255258
### SAP Installation media storage account
256259

257260
> [!div class="mx-tdCol2BreakAll "]
@@ -266,32 +269,36 @@ The table below contains the parameters that define the resource group.
266269
> | -------------------------------- | -------------------------- | ---------- |
267270
> | `library_terraform_state_arm_id` | Azure resource identifier | Optional |
268271
272+
### DNS Support
273+
274+
275+
> [!div class="mx-tdCol2BreakAll "]
276+
> | Variable | Description | Type |
277+
> | ----------------------------------- | -------------------------------------------------------------------- | -------- |
278+
> | `use_custom_dns_a_registration` | Use an existing Private DNS zone | Optional |
279+
> | `management_dns_subscription_id` | Subscription ID for the subscription containing the Private DNS Zone | Optional |
280+
> | `management_dns_resourcegroup_name` | Resource group containing the Private DNS Zone | Optional |
281+
> | `dns_label` | DNS name of the private DNS zone | Optional |
282+
283+
269284
### Extra parameters
270285

271286

272287
> [!div class="mx-tdCol2BreakAll "]
273-
> | Variable | Description | Type |
274-
> | ---------------------------------- | -------------------------------- | -------- |
275-
> | `dns_label` | DNS name of the private DNS zone | Optional |
276-
> | `use_private_endpoint` | Use private endpoints | Optional |
288+
> | Variable | Description | Type |
289+
> | -------------------------------------------- | ----------------------------------- | -------- |
290+
> | `use_private_endpoint` | Use private endpoints | Optional |
291+
> | `use_service_endpoint` | Use service endpoints for subnets | Optional |
292+
> | `enable_firewall_for_keyvaults_and_storage` | Restrict access to selected subnets | Optional |
277293
278294
### Example parameters file for sap library (required parameters only)
279295

280296
```terraform
281297
# The environment value is a mandatory field, it is used for partitioning the environments, for example (PROD and NP)
282-
environment="MGMT"
298+
environment = "MGMT"
283299
284300
# The location/region value is a mandatory field, it is used to control where the resources are deployed
285-
location="westeurope"
286-
287-
# The deployer_environment value is a mandatory field, it is used for identifying the deployer
288-
deployer_environment="MGMT"
289-
290-
# The deployer_location value is a mandatory field, it is used for identifying the deployer
291-
deployer_location="westeurope"
292-
293-
# The deployer_vnet value is a mandatory field, it is used for identifying the deployer
294-
deployer_vnet="DEP00"
301+
location = "westeurope"
295302
296303
```
297304

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -218,15 +218,18 @@ ANF_service_level = "Ultra"
218218
219219
```
220220

221-
### DNS Support
221+
### DNS Support
222+
222223

223224
> [!div class="mx-tdCol2BreakAll "]
224-
> | Variable | Description | Type | Notes |
225-
> | ------------------------------------ | -----------------------------------------------------------------------| ----------- | ------ |
226-
> | `use_custom_dns_a_registration` | Should a custom DNS A record be created when using private endpoints. | Optional | |
227-
> | `management_dns_subscription_id` | Custom DNS subscription ID. | Optional | |
228-
> | `management_dns_resourcegroup_name` | Custom DNS resource group name. | Optional | |
229-
> | | | | |
225+
> | Variable | Description | Type |
226+
> | ----------------------------------- | -------------------------------------------------------------------- | -------- |
227+
> | `use_custom_dns_a_registration` | Use an existing Private DNS zone | Optional |
228+
> | `management_dns_subscription_id` | Subscription ID for the subscription containing the Private DNS Zone | Optional |
229+
> | `management_dns_resourcegroup_name` | Resource group containing the Private DNS Zone | Optional |
230+
> | `dns_label` | DNS name of the private DNS zone | Optional |
231+
232+
230233
## Other Parameters
231234

232235
> [!div class="mx-tdCol2BreakAll "]
@@ -235,6 +238,7 @@ ANF_service_level = "Ultra"
235238
> | `enable_purge_control_for_keyvaults` | Is purge control is enabled on the Key Vault. | Optional | Use only for test deployments |
236239
> | `use_private_endpoint` | Are private endpoints created for storage accounts and key vaults. | Optional | |
237240
> | `use_service_endpoint` | Are service endpoints defined for the subnets. | Optional | |
241+
> | `enable_firewall_for_keyvaults_and_storage` | Restrict access to selected subnets | Optional |
238242
> | `diagnostics_storage_account_arm_id` | The Azure resource identifier for the diagnostics storage account | Required | For brown field deployments. |
239243
> | `witness_storage_account_arm_id` | The Azure resource identifier for the witness storage account | Required | For brown field deployments. |
240244

0 commit comments

Comments
 (0)