Skip to content

Commit 9c77228

Browse files
PRMerger7PRMerger7
authored
Merge pull request #201043 from KimForss/main
variable updates
2 parents f7acffb + ff6f764 commit 9c77228

File tree

2 files changed

+27
-12
lines changed

2 files changed

+27
-12
lines changed

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

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,7 @@ The table below contains the parameters that define the resource group.
7070
> | ----------------------- | -------------------------------------------------------- | ---------- |
7171
> | `resource_group_name` | Name of the resource group to be created | Optional |
7272
> | `resource_group_arm_id` | Azure resource identifier for an existing resource group | Optional |
73-
74-
73+
> | `resource_group_tags` | Tags to be associated to the resource group | Optional |
7574
7675

7776
## SAP Virtual Hostname parameters
@@ -105,8 +104,8 @@ The database tier defines the infrastructure for the database tier, supported da
105104
> | `database_high_availability` | Defines if the database tier is deployed highly available. | Optional | See [High availability configuration](automation-configure-system.md#high-availability-configuration) |
106105
> | `database_server_count` | Defines the number of database servers. | Optional | Default value is 1 |
107106
> | `database_vm_zones` | Defines the Availability Zones for the database servers. | Optional | |
108-
> | `database_size` | Defines the database sizing information. | Required | See [Custom Sizing](automation-configure-extra-disks.md) |
109-
> | `db_disk_sizes_filename` | Defines the custom database sizing. | Optional | See [Custom Sizing](automation-configure-extra-disks.md) |
107+
> | `db_sizing_dictionary_key` | Defines the database sizing information. | Required | See [Custom Sizing](automation-configure-extra-disks.md) |
108+
> | `db_disk_sizes_filename` | Defines the custom database sizing file name. | Optional | See [Custom Sizing](automation-configure-extra-disks.md) |
110109
> | `database_vm_use_DHCP` | Controls if Azure subnet provided IP addresses should be used. | Optional | |
111110
> | `database_vm_db_nic_ips` | Defines the IP addresses for the database servers (database subnet). | Optional | |
112111
> | `database_vm_db_nic_secondary_ips` | Defines the secondary IP addresses for the database servers (database subnet). | Optional | |
@@ -141,7 +140,7 @@ The application tier defines the infrastructure for the application tier, which
141140
> | ---------------------------------- | --------------------------------------------------------------------------- | -----------| ------ |
142141
> | `enable_app_tier_deployment` | Defines if the application tier is deployed | Optional | |
143142
> | `sid` | Defines the SAP application SID | Required | |
144-
> | `app_tier_vm_sizing` | Lookup value defining the VM SKU and the disk layout for tha application tier servers | Optional |
143+
> | `app_tier_sizing_dictionary_key` | Lookup value defining the VM SKU and the disk layout for tha application tier servers | Optional |
145144
> | `app_disk_sizes_filename` | Defines the custom disk size file for the application tier servers | Optional | See [Custom Sizing](automation-configure-extra-disks.md) |
146145
> | `app_tier_authentication_type` | Defines the authentication type for the application tier virtual machine(s) | Optional | |
147146
> | `app_tier_use_DHCP` | Controls if Azure subnet provided IP addresses should be used (dynamic) | Optional | |
@@ -246,6 +245,20 @@ The table below contains the networking parameters.
246245
247246
\* = Required For brown field deployments.
248247

248+
## Key Vault Parameters
249+
250+
If you don't want to use the workload zone key vault but another one, this can be added in the system's tfvars file.
251+
252+
The table below defines the parameters used for defining the Key Vault information.
253+
254+
> [!div class="mx-tdCol2BreakAll "]
255+
> | Variable | Description | Type | Notes |
256+
> | ----------------------------------- | ------------------------------------------------------------------------------ | ------------ | ----------------------------------- |
257+
> | `user_keyvault_id` | Azure resource identifier for existing system credentials key vault | Optional | |
258+
> | `spn_keyvault_id` | Azure resource identifier for existing deployment credentials (SPNs) key vault | Optional | |
259+
> | `enable_purge_control_for_keyvaults | Disables the purge protection for Azure key vaults. | Optional | Only use this for test environments |
260+
261+
249262
### Anchor virtual machine parameters
250263

251264
The SAP deployment automation framework supports having an Anchor virtual machine. The anchor virtual machine will be the first virtual machine to be deployed and is used to anchor the proximity placement group.
@@ -292,13 +305,15 @@ By default the SAP System deployment uses the credentials from the SAP Workload
292305

293306

294307
> [!div class="mx-tdCol2BreakAll "]
295-
> | Variable | Description | Type |
296-
> | ---------------------------------------------- | ------------------------------------- | ----------- |
308+
> | Variable | Description | Type |
309+
> | ---------------------------------------------- | ------------------------------------------------------------------------------- | ----------- |
297310
> | `resource_offset` | Provides and offset for resource naming. The offset number for resource naming when creating multiple resources. The default value is 0, which creates a naming pattern of disk0, disk1, and so on. An offset of 1 creates a naming pattern of disk1, disk2, and so on. | Optional |
298311
> | `disk_encryption_set_id` | The disk encryption key to use for encrypting managed disks using customer provided keys | Optional |
299312
> | `use_loadbalancers_for_standalone_deployments` | Controls if load balancers are deployed for standalone installations | Optional |
300313
> | `license_type` | Specifies the license type for the virtual machines. | Possible values are `RHEL_BYOS` and `SLES_BYOS`. For Windows the possible values are `None`, `Windows_Client` and `Windows_Server`. |
301314
> | `use_zonal_markers` | Specifies if zonal Virtual Machines will include a zonal identifier. 'xooscs_z1_00l###' vs 'xooscs00l###'| Default value is true. |
315+
> | `proximityplacementgroup_names` | Specifies the names of the proximity placement groups | |
316+
> | `proximityplacementgroup_arm_ids` | Specifies the Azure resource identifiers of existing proximity placement groups| |
302317
303318

304319
## NFS support

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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 |
142-
> | ---------------------------------- | ------------------------------------------------------------------------- | ------------- |
143-
> | `user_keyvault_id` | Azure resource identifier for the system credentials key vault | Optional |
144-
> | `spn_keyvault_id` | Azure resource identifier for the deployment credentials (SPNs) key vault | Optional |
145-
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

0 commit comments

Comments
 (0)