Skip to content

Commit b10be26

Browse files
author
Kimmo Forss
committed
tutorial updates
1 parent bcf18b7 commit b10be26

File tree

1 file changed

+26
-12
lines changed

1 file changed

+26
-12
lines changed

articles/sap/automation/tutorial.md

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,10 @@ If you don't assign the User Access Administrator role to the service principal,
273273
# enable_firewall_for_keyvaults_and_storage defines that the storage accounts and key vaults have firewall enabled
274274
enable_firewall_for_keyvaults_and_storage = false
275275
276+
# public_network_access_enabled controls if storage account and key vaults have public network access enabled
277+
public_network_access_enabled = true
278+
279+
276280
```
277281
278282
Note the Terraform variable file locations for future edits during deployment.
@@ -304,14 +308,21 @@ For example, choose **North Europe** as the deployment location, with the four-c
304308
305309
The sample SAP library configuration file `MGMT-NOEU-SAP_LIBRARY.tfvars` is in the `~/Azure_SAP_Automated_Deployment/WORKSPACES/LIBRARY/MGMT-NOEU-SAP_LIBRARY` folder.
306310
311+
Set the environment variables for the service principal:
312+
313+
```bash
314+
315+
export ARM_SUBSCRIPTION_ID="<subscriptionId>"
316+
export ARM_CLIENT_ID="<appId>"
317+
export ARM_CLIENT_SECRET="<password>"
318+
export ARM_TENANT_ID="<tenantId>"
319+
320+
```
321+
307322
1. Create the deployer and the SAP library. Add the service principal details to the deployment key vault.
308323

309324
```bash
310325

311-
export ARM_SUBSCRIPTION_ID="<subscriptionId>"
312-
export ARM_CLIENT_ID="<appID>"
313-
export ARM_CLIENT_SECRET="<password>"
314-
export ARM_TENANT_ID="<tenant>"
315326
export env_code="MGMT"
316327
export vnet_code="DEP00"
317328
export region_code="<region_code>"
@@ -322,14 +333,17 @@ The sample SAP library configuration file `MGMT-NOEU-SAP_LIBRARY.tfvars` is in t
322333

323334
cd $CONFIG_REPO_PATH
324335

325-
${DEPLOYMENT_REPO_PATH}/deploy/scripts/deploy_controlplane.sh \
326-
--deployer_parameter_file DEPLOYER/${env_code}-${region_code}-${vnet_code}-INFRASTRUCTURE/${env_code}-${region_code}-${vnet_code}-INFRASTRUCTURE.tfvars \
327-
--library_parameter_file LIBRARY/${env_code}-${region_code}-SAP_LIBRARY/${env_code}-${region_code}-SAP_LIBRARY.tfvars \
328-
--subscription "${ARM_SUBSCRIPTION_ID}" \
329-
--spn_id "${ARM_CLIENT_ID}" \
330-
--spn_secret "${ARM_CLIENT_SECRET}" \
331-
--tenant_id "${ARM_TENANT_ID}" \
332-
--auto-approve
336+
deployer_parameter_file="${CONFIG_REPO_PATH}/DEPLOYER/${env_code}-${region_code}-${vnet_code}-INFRASTRUCTURE/${env_code}-${region_code}-${vnet_code}-INFRASTRUCTURE.tfvars"
337+
library_parameter_file="${CONFIG_REPO_PATH}/LIBRARY/${env_code}-${region_code}-SAP_LIBRARY/${env_code}-${region_code}-SAP_LIBRARY.tfvars"
338+
339+
${SAP_AUTOMATION_REPO_PATH}/deploy/scripts/deploy_controlplane.sh \
340+
--deployer_parameter_file "${deployer_parameter_file}" \
341+
--library_parameter_file "{library_parameter_file}" \
342+
--subscription "${ARM_SUBSCRIPTION_ID}" \
343+
--spn_id "${ARM_CLIENT_ID}" \
344+
--spn_secret "${ARM_CLIENT_SECRET}" \
345+
--tenant_id "${ARM_TENANT_ID}"
346+
333347
```
334348

335349
If you run into authentication issues, run `az logout` to sign out and clear the `token-cache`. Then run `az login` to reauthenticate.

0 commit comments

Comments
 (0)