Skip to content

Commit 98a0a04

Browse files
author
Kimmo Forss
committed
Update
1 parent d189f42 commit 98a0a04

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -324,19 +324,19 @@ Create a new variable group 'SDAF-MGMT' for the control plane environment using
324324
| Variable | Value | Notes |
325325
| ------------------------------- | ------------------------------------------------------------------ | -------------------------------------------------------- |
326326
| Agent | 'Azure Pipelines' or the name of the agent pool | Note, this pool will be created in a later step. |
327-
| ARM_CLIENT_ID | Enter the Service principal application ID. | |
328-
| ARM_CLIENT_SECRET | Enter the Service principal password. | Change variable type to secret by clicking the lock icon |
329-
| ARM_SUBSCRIPTION_ID | Enter the target subscription ID. | |
330-
| ARM_TENANT_ID | Enter the Tenant ID for the service principal. | |
327+
| ARM_CLIENT_ID | 'Service principal application ID'. | |
328+
| ARM_CLIENT_SECRET | 'Service principal password'. | Change variable type to secret by clicking the lock icon |
329+
| ARM_SUBSCRIPTION_ID | 'Target subscription ID'. | |
330+
| ARM_TENANT_ID | 'Tenant ID' for the service principal. | |
331331
| AZURE_CONNECTION_NAME | Previously created connection name. | |
332332
| sap_fqdn | SAP Fully Qualified Domain Name, for example 'sap.contoso.net'. | Only needed if Private DNS isn't used. |
333-
| FENCING_SPN_ID | Enter the service principal application ID for the fencing agent. | Required for highly available deployments using a service principal for fencing agent. |
334-
| FENCING_SPN_PWD | Enter the service principal password for the fencing agent. | Required for highly available deployments using a service principal for fencing agent. |
335-
| FENCING_SPN_TENANT | Enter the service principal tenant ID for the fencing agent. | Required for highly available deployments using a service principal for fencing agent. |
336-
| `PAT` | `<Personal Access Token>` | Use the Personal Token defined in the previous |
337-
| `POOL` | `<Agent Pool name>` | Use the Agent pool defined in the previous |
338-
| APP_REGISTRATION_APP_ID | App registration application ID | Required if deploying the web app |
339-
| WEB_APP_CLIENT_SECRET | App registration password | Required if deploying the web app |
333+
| FENCING_SPN_ID | 'Service principal application ID' for the fencing agent. | Required for highly available deployments using a service principal for fencing agent. |
334+
| FENCING_SPN_PWD | 'Service principal password' for the fencing agent. | Required for highly available deployments using a service principal for fencing agent. |
335+
| FENCING_SPN_TENANT | 'Service principal tenant ID' for the fencing agent. | Required for highly available deployments using a service principal for fencing agent. |
336+
| PAT | `<Personal Access Token>` | Use the Personal Token defined in the previous step |
337+
| POOL | `<Agent Pool name>` | The Agent pool to use for this environment |
338+
| APP_REGISTRATION_APP_ID | 'App registration application ID' | Required if deploying the web app |
339+
| WEB_APP_CLIENT_SECRET | 'App registration password' | Required if deploying the web app |
340340

341341
Save the variables.
342342

‎articles/virtual-machines/workloads/sap/automation-deployment-framework.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ The key components of the control plane are:
6060
- Storage account for Terraform state files
6161
- Storage account for SAP installation media
6262
- Azure Key Vault for deployment credentials
63+
- Configuration Web Application
6364

6465
The following diagram shows the key components of the control plane and workload zone.
6566

@@ -78,6 +79,18 @@ The application configuration will be performed from the Ansible Controller in t
7879

7980
For more information of how to configure and deploy the control plane, see [Configuring the control plane](automation-configure-control-plane.md) and [Deploying the control plane](automation-deploy-control-plane.md).
8081

82+
## Software acquisition process
83+
84+
The framework also provides an Ansible playbook that can be used to download the software from SAP and persist it in the storage accounts in the SAP Library resource group.
85+
86+
The software acquisition is using an SAP Application manifest file that contains the list of SAP software to be downloaded. The manifest file is a YAML file that contains the following information:
87+
88+
- List of files to be downloaded
89+
- List of the Product IDs for the SAP application components
90+
- A set of template files used to provide the parameters for the unattended installation
91+
92+
The SAP Software download playbook will process the manifest file and the dependent manifest files and download the SAP software from SAP using the specified SAP user account. The software will be downloaded to the SAP Library storage account and will be available for the installation process. As part of the download the process the application manifest and the supporting templates will also be persisted in the storage account. The application manifest and the dependent manifests will be aggregated into a single manifest file that will be used by the installation process.
93+
8194
### Deployer Virtual Machine
8295

8396
This virtual machine is used to run the orchestration scripts that will deploy the Azure resources using Terraform. It's also the Ansible Controller and is used to execute the Ansible playbooks on all the managed nodes, i.e the virtual machines of an SAP deployment.

0 commit comments

Comments
 (0)