Skip to content

Commit 8e6388a

Browse files
author
Kimmo Forss
committed
Variable name updates
1 parent 810fc0a commit 8e6388a

File tree

3 files changed

+29
-27
lines changed

3 files changed

+29
-27
lines changed

‎articles/sap/automation/deploy-control-plane.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -119,30 +119,30 @@ cd ~/Azure_SAP_Automated_Deployment
119119
cp -Rp samples/Terraform/WORKSPACES config
120120
cd config/WORKSPACES
121121

122-
export subscriptionId="<subscriptionId>"
123-
export spn_id="<appId>"
124-
export spn_secret="<password>"
125-
export tenant_id="<tenantId>"
126-
export env_code="MGMT"
127-
export region_code="WEEU"
128-
export vnet_code="WEEU"
122+
export ARM_SUBSCRIPTION_ID="<subscriptionId>"
123+
export ARM_CLIENT_ID="<appId>"
124+
export ARM_CLIENT_SECRET="<password>"
125+
export ARM_TENANT_ID="<tenantId>"
126+
export env_code="MGMT"
127+
export region_code="WEEU"
128+
export vnet_code="WEEU"
129129

130-
az login --service-principal -u $spn_id -p=$spn_secret --tenant $tenant_id
130+
az login --service-principal -u "${ARM_CLIENT_ID}" -p="${ARM_CLIENT_SECRET}" --tenant "${ARM_TENANT_ID}"
131131

132132

133133
export DEPLOYMENT_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
134-
export ARM_SUBSCRIPTION_ID="${subscriptionId}"
134+
="${subscriptionId}"
135135
export CONFIG_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/config/WORKSPACES"
136136
export SAP_AUTOMATION_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
137137

138138

139139
sudo ${SAP_AUTOMATION_REPO_PATH}/deploy/scripts/deploy_controlplane.sh \
140140
--deployer_parameter_file "${CONFIG_REPO_PATH}/DEPLOYER/${env_code}-${region_code}-${vnet_code}-INFRASTRUCTURE/${env_code}-${region_code}-${vnet_code}-INFRASTRUCTURE.tfvars" \
141141
--library_parameter_file "${CONFIG_REPO_PATH}/LIBRARY/${env_code}-${region_code}-SAP_LIBRARY/${env_code}-${region_code}-SAP_LIBRARY.tfvars" \
142-
--subscription "${subscriptionId}" \
143-
--spn_id "${spn_id}" \
144-
--spn_secret "${spn_secret}" \
145-
--tenant_id "${tenant_id}" \
142+
--subscription "${ARM_SUBSCRIPTION_ID}" \
143+
--spn_id "${ARM_CLIENT_ID}" \
144+
--spn_secret "${ARM_CLIENT_SECRET}" \
145+
--tenant_id "${ARM_TENANT_ID}" \
146146
--auto-approve
147147
```
148148

‎articles/sap/automation/deploy-system.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,17 +129,21 @@ You can copy the sample configuration files to start testing the deployment auto
129129
```bash
130130
cd ~/Azure_SAP_Automated_Deployment
131131

132-
cp -Rp sap-automation/deploy/samples/WORKSPACES WORKSPACES
132+
cp -Rp sap-automation/deploy/samples/WORKSPACES config
133133

134134
```
135135

136136

137137
```bash
138+
139+
export CONFIG_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/config/WORKSPACES"
140+
export SAP_AUTOMATION_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
141+
138142
cd ~/Azure_SAP_Automated_Deployment/WORKSPACES/SYSTEM/DEV-WEEU-SAP01-X01
139143

140-
${DEPLOYMENT_REPO_PATH}/deploy/scripts/installer.sh \
144+
${SAP_AUTOMATION_REPO_PATH}/deploy/scripts/installer.sh \
141145
--parameterfile DEV-WEEU-SAP01-X01.tfvars \
142-
--type sap_system
146+
--type sap_system --auto-approve
143147
```
144148
# [Windows](#tab/windows)
145149

‎articles/sap/automation/deploy-workload-zone.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,19 @@ cp -R sap-automation/samples/WORKSPACES config
112112

113113
```bash
114114

115-
export subscriptionId="<subscriptionId>"
116-
export spn_id="<appId>"
117-
export spn_secret="<password>"
118-
export tenant_id="<tenantId>"
115+
export ARM_SUBSCRIPTION_ID="<subscriptionId>"
116+
export ARM_CLIENT_ID="<appId>"
117+
export ARM_CLIENT_SECRET="<password>"
118+
export ARM_TENANT_ID="<tenantId>"
119119
export env_code="DEV"
120120
export region_code="<region_code>"
121121
export vnet_code="SAP02"
122122
export deployer_environment="MGMT"
123-
export deployer_tfstate_key="MGMT"
124123

125-
az login --service-principal -u $spn_id -p=$spn_secret --tenant $tenant_id
124+
az login --service-principal -u "${ARM_CLIENT_ID}" -p="${ARM_CLIENT_SECRET}" --tenant "${ARM_TENANT_ID}"
126125

127126

128127
export DEPLOYMENT_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
129-
export ARM_SUBSCRIPTION_ID="${subscriptionId}"
130128
export CONFIG_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/config/WORKSPACES"
131129
export SAP_AUTOMATION_REPO_PATH="${HOME}/Azure_SAP_Automated_Deployment/sap-automation"
132130

@@ -136,10 +134,10 @@ parameterFile="${env_code}-${region_code}-${vnet_code}-INFRASTRUCTURE.tfvars"
136134
$SAP_AUTOMATION_REPO_PATH/deploy/scripts/install_workloadzone.sh \
137135
--parameterfile "${parameterFile}" \
138136
--deployer_environment "${deployer_environment}" \
139-
--subscription "${subscriptionId}" \
140-
--spn_id "${spn_id}" \
141-
--spn_secret "${spn_secret}" \
142-
--tenant_id "${tenant_id}" \
137+
--subscription "${ARM_SUBSCRIPTION_ID}" \
138+
--spn_id "${ARM_CLIENT_ID}" \
139+
--spn_secret "${ARM_CLIENT_SECRET}" \
140+
--tenant_id "${ARM_TENANT_ID}" \
143141
--auto-approve
144142

145143
```

0 commit comments

Comments
 (0)