Skip to content

Commit 5a048bc

Browse files
asudbringasudbring
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into vnet-delegation-update
2 parents 0047967 + 5fa7652 commit 5a048bc

File tree

6 files changed

+222
-241
lines changed

6 files changed

+222
-241
lines changed

‎articles/healthcare-apis/iot/overview-of-samples.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: The MedTech service scenario-based mappings samples - Azure Health Data Services
2+
title: MedTech service scenario-based mappings samples - Azure Health Data Services
33
description: Learn about the MedTech service scenario-based mappings samples.
44
services: healthcare-apis
55
author: msjasteppe
@@ -16,7 +16,7 @@ ms.author: jasteppe
1616
> [Fast Healthcare Interoperability Resources (FHIR®)](https://www.hl7.org/fhir/) is an open healthcare specification.
1717
1818

19-
The [MedTech service](overview.md) scenario-based [samples](https://github.com/Azure-Samples/azure-health-data-services-samples/tree/main/samples/medtech-service-mappings) provide conforming and valid [device](overview-of-device-mapping.md) and [FHIR destination](overview-of-fhir-destination-mapping.md) mappings and test device messages. Theses samples can be used to help with the authoring and troubleshooting of your own MedTech service mappings.
19+
The [MedTech service](overview.md) scenario-based [samples](https://github.com/Azure-Samples/azure-health-data-and-ai-samples/tree/main/samples/medtech-service-mappings) provide conforming and valid [device](overview-of-device-mapping.md) and [FHIR destination](overview-of-fhir-destination-mapping.md) mappings and test device messages. Theses samples can be used to help with the authoring and troubleshooting of your own MedTech service mappings.
2020

2121
## Sample resources
2222

@@ -32,11 +32,11 @@ Each MedTech service scenario-based sample contains the following resources:
3232
3333
## CalculatedContent
3434

35-
[Conversions using functions](https://github.com/Azure-Samples/azure-health-data-services-samples/tree/main/samples/medtech-service-mappings/calculatedcontent/conversions-using-functions)
35+
[Conversions using functions](https://github.com/Azure-Samples/azure-health-data-and-ai-samples/tree/main/samples/medtech-service-mappings/calculatedcontent/conversions-using-functions)
3636

3737
## IotJsonPathContent
3838

39-
[Single device message into multiple resources](https://github.com/Azure-Samples/azure-health-data-services-samples/tree/main/samples/medtech-service-mappings/iotjsonpathcontent/single-device-message-into-multiple-resources)
39+
[Single device message into multiple resources](https://github.com/Azure-Samples/azure-health-data-and-ai-samples/tree/main/samples/medtech-service-mappings/iotjsonpathcontent/single-device-message-into-multiple-resources)
4040

4141
## Next steps
4242

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

Lines changed: 53 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
title: About Control Plane deployment for the SAP on Azure Deployment Automation Framework
3-
description: Overview of the Control Plan deployment process within the SAP on Azure Deployment Automation Framework.
2+
title: Deploy the control plane for SAP Deployment Automation Framework
3+
description: Overview of the control plane deployment process in SAP Deployment Automation Framework.
44
author: kimforss
55
ms.author: kimforss
66
ms.reviewer: kimforss
@@ -13,38 +13,38 @@ ms.custom: devx-track-azurecli
1313

1414
# Deploy the control plane
1515

16-
The control plane deployment for the [SAP on Azure Deployment Automation Framework](deployment-framework.md) consists of the following components:
17-
- Deployer
18-
- SAP library
16+
The control plane deployment for [SAP Deployment Automation Framework](deployment-framework.md) consists of the:
1917

20-
:::image type="content" source="./media/deployment-framework/control-plane.png" alt-text="Diagram Control Plane.":::
18+
- Deployer
19+
- SAP library
20+
21+
:::image type="content" source="./media/deployment-framework/control-plane.png" alt-text="Diagram that shows the control plane.":::
2122

2223
## Prepare the deployment credentials
2324

24-
The SAP Deployment Frameworks uses Service Principals when doing the deployments. You can create the Service Principal for the Control Plane deployment using the following steps using an account with permissions to create Service Principals:
25+
SAP Deployment Automation Framework uses service principals for deployments. To create a service principal for the control plane deployment, use an account that has permissions to create service principals:
2526

2627
```azurecli
2728
az ad sp create-for-rbac --role="Contributor" --scopes="/subscriptions/<subscriptionID>" --name="<environment>-Deployment-Account"
2829
2930
```
3031

3132
> [!IMPORTANT]
32-
> The name of the Service Principal must be unique.
33+
> The name of the service principal must be unique.
3334
>
34-
> Record the output values from the command.
35+
> Record the output values from the command:
3536
> - appId
3637
> - password
3738
> - tenant
3839
39-
Optionally assign the following permissions to the Service Principal:
40+
Optionally, assign the following permissions to the service principal:
4041

4142
```azurecli
4243
az role assignment create --assignee <appId> --role "User Access Administrator" --scope /subscriptions/<subscriptionID>/resourceGroups/<resourceGroupName>
4344
```
4445

45-
46-
## Prepare the webapp
47-
This step is optional. If you would like a browser-based UX to help the configuration of SAP workload zones and systems, run the following commands before deploying the control plane.
46+
## Prepare the web app
47+
This step is optional. If you want a browser-based UX to help the configuration of SAP workload zones and systems, run the following commands before you deploy the control plane.
4848

4949
# [Linux](#tab/linux)
5050

@@ -93,18 +93,17 @@ del manifest.json
9393

9494
# [Azure DevOps](#tab/devops)
9595

96-
It's currently not possible to perform this action from Azure DevOps.
96+
Currently, it isn't possible to perform this action from Azure DevOps.
9797

9898
---
9999

100-
101100
## Deploy the control plane
102-
103-
The sample Deployer configuration file `MGMT-WEEU-DEP00-INFRASTRUCTURE.tfvars` is located in the `~/Azure_SAP_Automated_Deployment/samples/Terraform/WORKSPACES/DEPLOYER/MGMT-WEEU-DEP00-INFRASTRUCTURE` folder.
104101

105-
The sample SAP Library configuration file `MGMT-WEEU-SAP_LIBRARY.tfvars` is located in the `~/Azure_SAP_Automated_Deployment/samples/Terraform/WORKSPACES/LIBRARY/MGMT-WEEU-SAP_LIBRARY` folder.
102+
The sample deployer configuration file `MGMT-WEEU-DEP00-INFRASTRUCTURE.tfvars` is located in the `~/Azure_SAP_Automated_Deployment/samples/Terraform/WORKSPACES/DEPLOYER/MGMT-WEEU-DEP00-INFRASTRUCTURE` folder.
103+
104+
The sample SAP library configuration file `MGMT-WEEU-SAP_LIBRARY.tfvars` is located in the `~/Azure_SAP_Automated_Deployment/samples/Terraform/WORKSPACES/LIBRARY/MGMT-WEEU-SAP_LIBRARY` folder.
106105

107-
Running the following command creates the Deployer, the SAP Library and adds the Service Principal details to the deployment key vault. If you followed the web app setup in the previous step, this command also creates the infrastructure to host the application.
106+
Run the following command to create the deployer and the SAP library. The command adds the service principal details to the deployment key vault. If you followed the web app setup in the previous step, this command also creates the infrastructure to host the application.
108107

109108
# [Linux](#tab/linux)
110109

@@ -142,52 +141,51 @@ sudo ${SAP_AUTOMATION_REPO_PATH}/deploy/scripts/deploy_controlplane.sh
142141
--tenant_id "${ARM_TENANT_ID}"
143142
```
144143

145-
146144
# [Windows](#tab/windows)
147145

148146
You can't perform a control plane deployment from Windows.
147+
149148
# [Azure DevOps](#tab/devops)
150149

151-
Open (https://dev.azure.com) and go to your Azure DevOps project.
150+
Open [Azure DevOps](https://dev.azure.com) and go to your Azure DevOps project.
152151

153-
> [!NOTE]
154-
> Ensure that the 'Deployment_Configuration_Path' variable in the 'SDAF-General' variable group is set to the folder that contains your configuration files, for this example you can use 'samples/WORKSPACES'.
152+
Ensure that the `Deployment_Configuration_Path` variable in the `SDAF-General` variable group is set to the folder that contains your configuration files. For this example, you can use `samples/WORKSPACES`.
155153

156-
The deployment uses the configuration defined in the Terraform variable files located in the 'WORKSPACES/DEPLOYER/MGMT-WEEU-DEP00-INFRASTRUCTURE' and 'WORKSPACES/LIBRARY/MGMT-WEEU-SAP_LIBRARY' folders.
154+
The deployment uses the configuration defined in the Terraform variable files located in the `WORKSPACES/DEPLOYER/MGMT-WEEU-DEP00-INFRASTRUCTURE` and `WORKSPACES/LIBRARY/MGMT-WEEU-SAP_LIBRARY` folders.
157155

158-
Run the pipeline by selecting the _Deploy control plane_ pipeline from the Pipelines section. Enter the configuration names for the deployer and the SAP library. Use 'MGMT-WEEU-DEP00-INFRASTRUCTURE' as the Deployer configuration name and 'MGMT-WEEU-SAP_LIBRARY' as the SAP Library configuration name.
156+
Run the pipeline by selecting the `Deploy control plane` pipeline from the **Pipelines** section. Enter the configuration names for the deployer and the SAP library. Use `MGMT-WEEU-DEP00-INFRASTRUCTURE` as the deployer configuration name and `MGMT-WEEU-SAP_LIBRARY` as the SAP library configuration name.
159157

160-
:::image type="content" source="media/devops/automation-run-pipeline.png" alt-text="Screenshot of Azure DevOps run pipeline dialog.":::
158+
:::image type="content" source="media/devops/automation-run-pipeline.png" alt-text="Screenshot that shows the Azure DevOps Run pipeline dialog.":::
161159

162-
You can track the progress in the Azure DevOps portal. Once the deployment is complete, you can see the Control Plane details in the _Extensions_ tab.
160+
You can track the progress in the Azure DevOps portal. After the deployment is finished, you can see the control plane details on the **Extensions** tab.
163161

164-
:::image type="content" source="media/devops/automation-run-pipeline-control-plane.png" alt-text="Screenshot of the run Azure DevOps pipeline run results.":::
162+
:::image type="content" source="media/devops/automation-run-pipeline-control-plane.png" alt-text="Screenshot that shows the run Azure DevOps pipeline run results.":::
165163

166164
---
167165

168-
### Manually configure the deployer using Azure Bastion
166+
### Manually configure the deployer by using Azure Bastion
169167

170-
Connect to the deployer by following these steps:
168+
To connect to the deployer:
171169

172170
1. Sign in to the [Azure portal](https://portal.azure.com).
173171

174-
1. Navigate to the resource group containing the deployer virtual machine.
172+
1. Go to the resource group that contains the deployer virtual machine (VM).
175173

176-
1. Connect to the virtual machine using Azure Bastion.
174+
1. Connect to the VM by using Azure Bastion.
177175

178-
1. The default username is *azureadm*
176+
1. The default username is **azureadm**.
179177

180-
1. Choose *SSH Private Key from Azure Key Vault*
178+
1. Select **SSH Private Key from Azure Key Vault**.
181179

182-
1. Select the subscription containing the control plane.
180+
1. Select the subscription that contains the control plane.
183181

184182
1. Select the deployer key vault.
185183

186-
1. From the list of secrets choose the secret ending with *-sshkey*.
184+
1. From the list of secrets, choose the secret that ends with **-sshkey**.
187185

188-
1. Connect to the virtual machine.
186+
1. Connect to the VM.
189187

190-
Run the following script to configure the deployer.
188+
Run the following script to configure the deployer:
191189

192190
```bash
193191

@@ -204,40 +202,38 @@ cd sap-automation/deploy/scripts
204202
./configure_deployer.sh
205203
```
206204

207-
The script installs Terraform and Ansible and configure the deployer.
205+
The script installs Terraform and Ansible and configures the deployer.
208206

209207
### Manually configure the deployer
210208

211-
> [!NOTE]
212-
>You need to connect to the deployer virtual Machine from a computer that is able to reach the Azure Virtual Network
209+
Connect to the deployer VM from a computer that can reach the Azure virtual network.
213210

214-
Connect to the deployer by following these steps:
211+
To connect to the deployer:
215212

216213
1. Sign in to the [Azure portal](https://portal.azure.com).
217214

218215
1. Select or search for **Key vaults**.
219216

220-
1. On the **Key vault** page, find the deployer key vault. The name starts with `MGMT[REGION]DEP00user`. Filter by the **Resource group** or **Location** if necessary.
217+
1. On the **Key vault** page, find the deployer key vault. The name starts with `MGMT[REGION]DEP00user`. Filter by the **Resource group** or **Location**, if necessary.
221218

222-
1. Select **Secrets** from the **Settings** section in the left pane.
219+
1. On the **Settings** section in the left pane, select **Secrets**.
223220

224-
1. Find and select the secret containing **sshkey**. It might look like this: `MGMT-[REGION]-DEP00-sshkey`
221+
1. Find and select the secret that contains **sshkey**. It might look like `MGMT-[REGION]-DEP00-sshkey`.
225222

226-
1. On the secret's page, select the current version. Then, copy the **Secret value**.
223+
1. On the secret's page, select the current version. Then copy the **Secret value**.
227224

228-
1. Open a plain text editor. Copy in the secret value.
229-
230-
1. Save the file where you keep SSH keys. For example, `C:\\Users\\<your-username>\\.ssh`.
231-
232-
1. Save the file. If you're prompted to **Save as type**, select **All files** if **SSH** isn't an option. For example, use `deployer.ssh`.
225+
1. Open a plain text editor. Copy the secret value.
226+
227+
1. Save the file where you keep SSH keys. An example is `C:\Users\<your-username>\.ssh`.
233228

234-
1. Connect to the deployer VM through any SSH client such as Visual Studio Code. Use the private IP address of the deployer, and the SSH key you downloaded. For instructions on how to connect to the Deployer using Visual Studio Code see [Connecting to Deployer using Visual Studio Code](tools-configuration.md#configuring-visual-studio-code). If you're using PuTTY, convert the SSH key file first using PuTTYGen.
229+
1. Save the file. If you're prompted to **Save as type**, select **All files** if **SSH** isn't an option. For example, use `deployer.ssh`.
235230

236-
> [!NOTE]
237-
>The default username is *azureadm*
231+
1. Connect to the deployer VM through any SSH client, such as Visual Studio Code. Use the private IP address of the deployer and the SSH key you downloaded. For instructions on how to connect to the deployer by using Visual Studio Code, see [Connect to the deployer by using Visual Studio Code](tools-configuration.md#configuring-visual-studio-code). If you're using PuTTY, convert the SSH key file first by using PuTTYGen.
238232

239-
Configure the deployer using the following script:
233+
> [!NOTE]
234+
>The default username is **azureadm**.
240235
236+
Configure the deployer by using the following script:
241237

242238
```bash
243239
mkdir -p ~/Azure_SAP_Automated_Deployment; cd $_
@@ -253,11 +249,9 @@ cd sap-automation/deploy/scripts
253249
./configure_deployer.sh
254250
```
255251

256-
The script installs Terraform and Ansible and configure the deployer.
257-
258-
252+
The script installs Terraform and Ansible and configures the deployer.
259253

260254
## Next step
261255

262256
> [!div class="nextstepaction"]
263-
> [Configure SAP Workload Zone](configure-workload-zone.md)
257+
> [Configure SAP workload zone](configure-workload-zone.md)

0 commit comments

Comments
 (0)