Skip to content

Commit a1f1c0f

Browse files
Merge pull request #260025 from KimForss/main
Misc edits
2 parents a0f9e44 + 9916d46 commit a1f1c0f

File tree

5 files changed

+78
-32
lines changed

5 files changed

+78
-32
lines changed

articles/sap/automation/configure-control-plane.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,21 @@ This table shows the networking parameters.
8383
> | `management_subnet_name` | The name of the subnet | Optional | |
8484
> | `management_subnet_address_prefix` | The address range for the subnet | Mandatory | For green-field deployments |
8585
> | `management_subnet_arm_id` | The Azure resource identifier for the subnet | Mandatory | For brown-field deployments |
86-
> | `management_subnet_nsg_name` | The name of the network security group | Optional | |
86+
> | `management_subnet_nsg_name` | The name of the network security group | Optional | |
8787
> | `management_subnet_nsg_arm_id` | The Azure resource identifier for the network security group | Mandatory | For brown-field deployments |
8888
> | `management_subnet_nsg_allowed_ips` | Range of allowed IP addresses to add to Azure Firewall | Optional | |
8989
> | | | | |
90-
> | `management_firewall_subnet_arm_id` | The Azure resource identifier for the Azure Firewall subnet | Mandatory | For brown-field deployments |
90+
> | `management_firewall_subnet_arm_id` | The Azure resource identifier for the Azure Firewall subnet | Mandatory | For brown-field deployments |
9191
> | `management_firewall_subnet_address_prefix` | The address range for the subnet | Mandatory | For green-field deployments |
9292
> | | | | |
93-
> | `management_bastion_subnet_arm_id` | The Azure resource identifier for the Azure Bastion subnet | Mandatory | For brown-field deployments |
93+
> | `management_bastion_subnet_arm_id` | The Azure resource identifier for the Azure Bastion subnet | Mandatory | For brown-field deployments |
9494
> | `management_bastion_subnet_address_prefix` | The address range for the subnet | Mandatory | For green-field deployments |
9595
> | | | | |
9696
> | `webapp_subnet_arm_id` | The Azure resource identifier for the web app subnet | Mandatory | For brown-field deployments by using the web app |
9797
> | `webapp_subnet_address_prefix` | The address range for the subnet | Mandatory | For green-field deployments by using the web app |
98+
> | | | | |
99+
> | `use_private_endpoint` | Use private endpoints. | Optional | |
100+
> | `use_service_endpoint` | Use service endpoints for subnets. | Optional | |
98101
99102
> [!NOTE]
100103
> When you use an existing subnet for the web app, the subnet must be empty, in the same region as the resource group being deployed, and delegated to Microsoft.Web/serverFarms.
@@ -184,10 +187,18 @@ This section defines the parameters used for defining the Azure Key Vault inform
184187
> | `bastion_deployment` | Boolean flag that controls if Azure Bastion host is to be deployed. | Optional | |
185188
> | `bastion_sku` | SKU for Azure Bastion host to be deployed (Basic/Standard). | Optional | |
186189
> | `enable_purge_control_for_keyvaults` | Boolean flag that controls 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 |
189190
> | `enable_firewall_for_keyvaults_and_storage` | Restrict access to selected subnets. | Optional |
190191
192+
### Web App parameters
193+
194+
> [!div class="mx-tdCol2BreakAll "]
195+
> | Variable | Description | Type | Notes |
196+
> | -------------------------------------------- | ---------------------------------------------------------------------- | ----------- | ------------------------------ |
197+
> | `use_webapp` | Boolean value indicating if a webapp should be deployed. | Optional | |
198+
> | `app_service_SKU_name` | The SKU of the App Service Plan. | Optional | |
199+
> | `app_registration_app_id` | The app registration id to be used for the webapp. | Optional | |
200+
> | `webapp_client_secret` | The SKU of the App Service Plan. | Optional | Will be persisted in Key Vault |
201+
191202
### Example parameters file for deployer (required parameters only)
192203

193204
```terraform

articles/sap/automation/configure-system.md

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -80,17 +80,20 @@ This section contains the parameters related to the Azure infrastructure.
8080

8181

8282
> [!div class="mx-tdCol2BreakAll "]
83-
> | Variable | Description | Type |
84-
> | ---------------------------------------------- | -------------------------------------------------------------------------------------------- | ---------- |
85-
> | `custom_disk_sizes_filename` | Defines the disk sizing file name, See [Custom sizing](configure-extra-disks.md). | Optional |
86-
> | `disk_encryption_set_id` | The disk encryption key to use for encrypting managed disks by using customer-provided keys. | Optional |
87-
> | `proximityplacementgroup_arm_ids` | Specifies the Azure resource identifiers of existing proximity placement groups. | |
88-
> | `proximityplacementgroup_names` | Specifies the names of the proximity placement groups. | |
89-
> | `resource_offset` | Provides an offset for resource naming. | Optional |
90-
> | `use_loadbalancers_for_standalone_deployments` | Controls if load balancers are deployed for standalone installations | Optional |
91-
> | `use_scalesets_for_deployment` | Use Flexible Virtual Machine Scale Sets for the deployment | Optional |
92-
> | `scaleset_id` | Azure resource identifier for the virtual machine scale set | Optional |
93-
> | `user_assigned_identity_id | User assigned identity to assign to the virtual machines | Optional |
83+
> | Variable | Description | Type |
84+
> | ---------------------------------------------- | ------------------------------------------------------------------------------------------------- | ---------- |
85+
> | `app_proximityplacementgroup_arm_ids` | Specifies the Azure resource identifiers of existing proximity placement groups for the app tier. | |
86+
> | `app_proximityplacementgroup_names` | Specifies the names of the proximity placement groups for the app tier. | |
87+
> | `custom_disk_sizes_filename` | Defines the disk sizing file name, See [Custom sizing](configure-extra-disks.md). | Optional |
88+
> | `disk_encryption_set_id` | The disk encryption key to use for encrypting managed disks by using customer-provided keys. | Optional |
89+
> | `proximityplacementgroup_arm_ids` | Specifies the Azure resource identifiers of existing proximity placement groups. | |
90+
> | `proximityplacementgroup_names` | Specifies the names of the proximity placement groups. | |
91+
> | `resource_offset` | Provides an offset for resource naming. | Optional |
92+
> | `scaleset_id` | Azure resource identifier for the virtual machine scale set | Optional |
93+
> | `use_app_proximityplacementgroups` | Controls if the app tier virtual machines are placed in a different ppg from the database. | Optional |
94+
> | `use_loadbalancers_for_standalone_deployments` | Controls if load balancers are deployed for standalone installations | Optional |
95+
> | `use_scalesets_for_deployment` | Use Flexible Virtual Machine Scale Sets for the deployment | Optional |
96+
> | `user_assigned_identity_id | User assigned identity to assign to the virtual machines | Optional |
9497
9598
The `resource_offset` parameter controls the naming of resources. For example, if you set the `resource_offset` to 1, the first disk will be named `disk1`. The default value is 0.
9699

articles/sap/automation/deployment-framework.md

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,20 @@ ms.topic: conceptual
1111
---
1212
# SAP Deployment Automation Framework
1313

14-
[SAP Deployment Automation Framework](https://github.com/Azure/sap-automation) is an open-source orchestration tool that's used to deploy, install, and maintain SAP environments. You can create infrastructure for SAP landscapes based on SAP HANA and NetWeaver with AnyDB by using [Terraform](https://www.terraform.io/) and [Ansible](https://www.ansible.com/) for the operating system and application configuration. You can deploy the systems on any of the SAP-supported operating system versions and into any Azure region.
14+
[SAP Deployment Automation Framework](https://github.com/Azure/sap-automation) is an open-source orchestration tool that can deploy, install, and maintain SAP environments. You can deploy the systems on any of the SAP-supported operating system versions and into any Azure region. You can create infrastructure for SAP landscapes based on SAP HANA and NetWeaver with AnyDB by using [Terraform](https://www.terraform.io/). The environments can be configured using [Ansible](https://www.ansible.com/).
1515

1616
[Terraform](https://www.terraform.io/) from Hashicorp is an open-source tool for provisioning and managing cloud infrastructure.
1717

1818
[Ansible](https://www.ansible.com/) is an open-source platform by Red Hat that automates cloud provisioning, configuration management, and application deployments. When you use Ansible, you can automate deployment and configuration of resources in your environment.
1919

2020
The [automation framework](https://github.com/Azure/sap-automation) has two main components:
2121

22-
- Deployment infrastructure (control plane and hub component)
23-
- SAP infrastructure (SAP workload and spoke component)
22+
- Deployment infrastructure (control plane, typically deployed in the hub)
23+
- SAP infrastructure (SAP workload zone, typically deployed in a spoke.)
24+
25+
The dependency between the control plane and the application plane is illustrated in the following diagram. In a typical deployment, a single control plane is used to manage multiple SAP deployments.
26+
27+
:::image type="content" source="./media/deployment-framework/control-plane-sap-infrastructure.png" alt-text="Diagram that shows the dependency between the control plane and the application plane for SAP Deployment Automation Framework.":::
2428

2529
You use the control plane of SAP Deployment Automation Framework to deploy the SAP infrastructure and the SAP application. The deployment uses Terraform templates to create the [infrastructure as a service (IaaS)](https://azure.microsoft.com/overview/what-is-iaas)-defined infrastructure to host the SAP applications.
2630

@@ -35,9 +39,6 @@ You can use the automation framework to deploy the following SAP architectures:
3539
- **Distributed**: With this architecture, you can separate the database server and the application tier. The application tier can further be separated in two by having SAP central services on a VM and one or more application servers.
3640
- **Distributed (highly available)**: This architecture is similar to the distributed architecture. In this deployment, the database and/or SAP central services can both be configured by using a highly available configuration that uses two VMs, each with Pacemaker clusters.
3741

38-
The dependency between the control plane and the application plane is illustrated in the following diagram. In a typical deployment, a single control plane is used to manage multiple SAP deployments.
39-
40-
:::image type="content" source="./media/deployment-framework/control-plane-sap-infrastructure.png" alt-text="Diagram that shows the dependency between the control plane and the application plane for SAP Deployment Automation Framework.":::
4142

4243
## About the control plane
4344

@@ -52,7 +53,7 @@ The control plane provides the following services:
5253
- Persistent storage for the downloaded SAP software
5354
- Azure Key Vault for secure storage for deployment credentials
5455
- Private DNS zone (optional)
55-
- Configuration for web applications
56+
- A Web application for configuration management
5657

5758
The control plane is typically a regional resource deployed into the hub subscription in a [hub-and-spoke architecture](/azure/architecture/reference-architectures/hybrid-networking/hub-spoke).
5859

@@ -84,7 +85,7 @@ The software acquisition is using an SAP application manifest file that contains
8485

8586
The SAP software download playbook processes the manifest file and the dependent manifest files and downloads the SAP software from SAP by using the specified SAP user account. The software is downloaded to the SAP library storage account and is available for the installation process.
8687

87-
As part of the download process, the application manifest and the supporting templates are also persisted in the storage account. The application manifest and the dependent manifests are aggregated into a single manifest file that's used by the installation process.
88+
As part of the download process, the application manifest and the supporting templates are also persisted in the storage account. The application manifest and the dependent manifests are aggregated into a single manifest file that is used by the installation process.
8889

8990
### Deployer VMs
9091

@@ -96,17 +97,17 @@ The SAP workload contains all the Azure infrastructure resources for the SAP dep
9697

9798
The SAP workload has two main components:
9899

99-
- SAP workload zone
100+
- SAP workload zone which is used for the shared resources for the SAP systems
100101
- SAP systems
101102

102103
## About the SAP workload zone
103104

104-
The workload zone allows for partitioning of the deployments into different environments, such as development, test, and production. The workload zone provides the shared services (networking and credentials management) to the SAP systems.
105+
The workload zone allows for partitioning of the deployments into different environments, such as development, test, and production. The workload zone provides the shared resources (networking and credentials management) to the SAP systems.
105106

106107
The SAP workload zone provides the following services to the SAP systems:
107108

108-
- Virtual networking infrastructure
109-
- Azure Key Vault for system credentials (VMs and SAP)
109+
- Virtual network
110+
- Azure Key Vault for system credentials (VMs and SAP accounts)
110111
- Shared storage (optional)
111112

112113
For more information about how to configure and deploy the SAP workload zone, see [Configure the workload zone](configure-workload-zone.md) and [Deploy the SAP workload zone](deploy-workload-zone.md).

articles/sap/automation/extensibility.md

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ custom_logical_volumes:
220220
```
221221

222222
> [!NOTE]
223-
> In order to use this functionality you need to add an additional disk named 'custom' to one or more of your Virtual machines. See [Custom disk sizing](configure-extra-disks.md) for more information.
223+
> In order to use this functionality you need to add an additional disk named 'custom' to one or more of your Virtual machines. For more information, see [Custom disk sizing](configure-extra-disks.md).
224224

225225
You can use the `configuration_settings` variable to let Terraform add them to sap-parameters.yaml file.
226226

@@ -242,7 +242,7 @@ configuration_settings = {
242242

243243
## Adding custom mount (Linux)
244244

245-
You can extend the SAP Deployment Automation Framework by mounting additional mount points in your installation.
245+
You can extend the SAP Deployment Automation Framework by mounting extra mount points in your installation.
246246

247247
When you add the following section to the sap-parameters.yaml file, a filesystem '/usr/custom' is mounted from an NFS share on "xxxxxxxxx.file.core.windows.net:/xxxxxxxxx/custom".
248248

@@ -276,7 +276,7 @@ configuration_settings = {
276276

277277
You can extend the SAP Deployment Automation Framework by adding additional folders to be exported from the Central Services virtual machine.
278278

279-
When you add the following section to the sap-parameters.yaml file, a filesystem '/usr/custom' will be exported from the Central Services virtual machine and available via NFS.
279+
When you add the following section to the sap-parameters.yaml file, a filesystem '/usr/custom' is exported from the Central Services virtual machine and available via NFS.
280280

281281
```yaml
282282
@@ -300,7 +300,38 @@ configuration_settings = {
300300
> [!NOTE]
301301
> This applies only for deployments with NFS_Provider set to 'NONE' as this makes the Central Services server an NFS Server.
302302

303+
## Custom Stripe sizes (Linux)
303304

305+
If you want to the stripe sizes used by the framework when creating the disks, you can add the following section to the sap-parameters.yaml file with the values you want.
306+
307+
```yaml
308+
# User and group IDs
309+
hana_data_stripe_size: 256
310+
hana_log_stripe_size: 64
311+
312+
db2_log_stripe_size: 64
313+
db2_data_stripe_size: 256
314+
db2_temp_stripe_size: 128
315+
316+
sybase_data_stripe_size: 256
317+
sybase_log_stripe_size: 64
318+
sybase_temp_stripe_size: 128
319+
320+
oracle_data_stripe_size: 256
321+
oracle_log_stripe_size: 128
322+
323+
```
324+
325+
## Custom volume sizes (Linux)
326+
327+
If you want to the default volume sizes used by the framework, you can add the following section to the sap-parameters.yaml file with the values you want.
328+
329+
```yaml
330+
331+
sapmnt_volume_size: 32g
332+
usrsap_volume_size: 32g
333+
hanashared_volume_size: 32g
334+
```
304335

305336
## Next step
306337

articles/sap/automation/get-started.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Some of the prerequisites might already be installed in your deployment environm
3131

3232
Using Azure DevOps streamlines the deployment process. Azure DevOps provides pipelines that you can run to perform the infrastructure deployment and the configuration and SAP installation activities.
3333

34-
You can use Azure Repos to store your configuration files. Use Azure Pipelines to deploy and configure the infrastructure and the SAP application.
34+
You can use Azure Repos to store your configuration files. Azure Pipelines provides pipelines, which can be used to deploy and configure the infrastructure and the SAP application.
3535

3636
### Sign up for Azure DevOps Services
3737

0 commit comments

Comments
 (0)