Merge pull request #180243 from KimForss/master

URL updates

Author: PRMerger3

articles/virtual-machines/workloads/sap/automation-bom-prepare.md

@@ -13,7 +13,7 @@ ms.service: virtual-machines-sap
 
 The [SAP deployment automation framework on Azure](automation-deployment-framework.md) uses a Bill of Materials (BOM). The BOM helps configure your SAP systems. 
 
-The automation framework's GitHub repository contains a set of [Sample BOMs](https://github.com/Azure/sap-hana/tree/main/deploy/ansible/BOM-catalog) that you can use to get started. It is also possible to create BOMs for other SAP Applications and databases. 
+The automation framework's GitHub repository contains a set of [Sample BOMs](https://github.com/Azure/sap-automation/tree/main/deploy/ansible/BOM-catalog) that you can use to get started. It is also possible to create BOMs for other SAP Applications and databases. 
 
 If you want to generate a BOM that includes permalinks, [follow the steps for creating this type of BOM](#permalinks).
 
@@ -218,7 +218,7 @@ To generate a BOM with permalinks:
 
 The following sample is a small part of an example BOM file for S/4HANA 1909 SP2. 
 
-You can find multiple complete, usable BOM files in the [GitHub repository](https://github.com/Azure/sap-hana).
+You can find multiple complete, usable BOM files in the [GitHub repository](https://github.com/Azure/sap-automation/deploy/ansible/BOM-catalog) folder.
 
 ```yml
 step|BOM Content

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

@@ -57,10 +57,10 @@ cd ~/Azure_SAP_Automated_Deployment/WORKSPACES
 az logout
 az login
 
-subscriptionID=<subscriptionID>
-appId=<appID>
-spn_secret=<password>
-tenant_id=<tenant>
+export subscriptionID=<subscriptionID>
+export appId=<appID>
+export spn_secret=<password>
+export tenant_id=<tenant>
 
 ${DEPLOYMENT_REPO_PATH}/deploy/scripts/prepare_region.sh                                                         \
         --deployer_parameter_file DEPLOYER/MGMT-WEEU-DEP00-INFRASTRUCTURE/MGMT-WEEU-DEP00-INFRASTRUCTURE.tfvars  \

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

@@ -98,21 +98,21 @@ Running the command below will deploy the SAP Workload Zone.
 ```bash
 cd ~/Azure_SAP_Automated_Deployment/WORKSPACES/LANDSCAPE/DEV-WEEU-SAP01-INFRASTRUCTURE
 
-subscriptionID=<subscriptionID>
-appId=<appID>
-spn_secret=<password>
-tenant_id=<tenant>
-keyvault=<keyvaultName>
-storageaccount=<storageaccountName>
-statefile_subscription=<statefile_subscription>
+export subscriptionID=<subscriptionID>
+export appId=<appID>
+export spn_secret=<password>
+export tenant_id=<tenant>
+export keyvault=<keyvaultName>
+export storageaccount=<storageaccountName>
+export statefile_subscription=<statefile_subscription>
 
 ${DEPLOYMENT_REPO_PATH}/deploy/scripts/install_workloadzone.sh \
         --parameterfile DEV-WEEU-SAP01-INFRASTRUCTURE.tfvars   \
         --keyvault $keyvault                                   \
         --state_subscription $statefile_subscription           \
         --subscription $subscriptionID                         \
         --spn_id $appID                                        \
-        --spn_secret "$spn_secret"                             \
+        --spn_secret $spn_secret                               \
         --tenant_id $tenant_id
 ```
 # [Windows](#tab/windows)
@@ -128,7 +128,7 @@ $statefile_subscription=<statefile_subscription>
 
 cd C:\Azure_SAP_Automated_Deployment\WORKSPACES\LANDSCAPE\DEV-WEEU-SAP01-INFRASTRUCTURE
 
-New-SAPWorkloadZone -Parameterfile .DEV-WEEU-SAP01-INFRASTRUCTURE.tfvars 
+New-SAPWorkloadZone -Parameterfile DEV-WEEU-SAP01-INFRASTRUCTURE.tfvars 
 -Subscription $subscription -SPN_id $appId -SPN_password $spn_secret -Tenant_id $tenant_id
 -State_subscription $statefile_subscription -Vault $keyvault -$StorageAccountName $storageaccount
 ```
@@ -138,8 +138,8 @@ New-SAPWorkloadZone -Parameterfile .DEV-WEEU-SAP01-INFRASTRUCTURE.tfvars
 > [!NOTE]
 > Be sure to replace the sample value `<subscriptionID>` with your subscription ID.
 > Replace the `<appID>`, `<password>`, `<tenant>` values with the output values of the SPN creation
-> Replace `<keyvaultName>` with the deployer key vault name
-> Replace `<storageaccountName>` with the name of the storage account containing the Terraform state files
+> Replace `<keyvault>` with the deployer key vault name
+> Replace `<storageaccount>` with the name of the storage account containing the Terraform state files
 > Replace `<statefile_subscription>` with the subscription ID for the storage account containing the Terraform state files
 
 ## Next step

articles/virtual-machines/workloads/sap/automation-naming-module.md

@@ -81,7 +81,8 @@ module "sap_namegenerator" {
   db_server_count  = var.database_server_count
   app_server_count = try(local.application.application_server_count, 0)
   web_server_count = try(local.application.webdispatcher_count, 0)
-  scs_server_count = local.application.scs_high_availability ? 2 * local.application.scs_server_count : local.application.scs_server_count  app_zones        = local.app_zones
+  scs_server_count = local.application.scs_high_availability ? 2 * local.application.scs_server_count : local.application.scs_server_count  
+  app_zones        = local.app_zones
   scs_zones        = local.scs_zones
   web_zones        = local.web_zones
   db_zones         = local.db_zones
@@ -98,13 +99,15 @@ Next, you need to point your other Terraform module files to your custom naming
 - `deploy\terraform\run\sap_library\module.tf`
 - `deploy\terraform\run\sap_deployer\module.tf`
 
-For each file, change the source for the module `sap_namegenerator` to point to your new naming module's location. For example `module "sap_namegenerator" { source = "../../terraform-units/modules/sap_namegenerator"` becomes `module "sap_namegenerator" { source = "../../../../Contoso_naming"`.
+For each file, change the source for the module `sap_namegenerator` to point to your new naming module's location. For example:
+
+`module "sap_namegenerator" { source = "../../terraform-units/modules/sap_namegenerator"` becomes `module "sap_namegenerator" { source = "../../../../Contoso_naming"`.
 
 ## Change resource group naming logic
 
 To change your resource group's naming logic, navigate to your custom naming module folder (for example, `Workspaces\Contoso_naming`). Then, edit the file `resourcegroup.tf`. Modify the following code with your own naming logic.
 
-```json
+```terraform
 locals {
 
   // Resource group naming
@@ -135,7 +138,7 @@ To change your resource suffixes, navigate to your custom naming module folder (
 > Only change the map **values**. Don't change the map **key**, which the Terraform code uses.
 > For example, if you want to rename the administrator network interface component, change `"admin-nic"           = "-admin-nic"` to `"admin-nic"           = "yourNICname"`.
 
-```json
+```terraform
 variable resource_suffixes {
   type        = map(string)
   description = "Extension of resource name"