Skip to content

Commit 4d8781b

Browse files
TaojunshenTaojunshen
authored
Merge pull request #267323 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 3ac4575 + 9b454d2 commit 4d8781b

File tree

5 files changed

+21
-18
lines changed

5 files changed

+21
-18
lines changed

‎articles/aks/gpu-multi-instance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Before you install the Nvidia plugins, you need to specify which multi-instance
120120
121121
```azurecli-interactive
122122
helm install \
123-
--version=0.7.0 \
123+
--version=0.14.0 \
124124
--generate-name \
125125
--set migStrategy=${MIG_STRATEGY} \
126126
nvdp/nvidia-device-plugin

‎articles/azure-resource-manager/bicep/bicep-functions-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ Namespace: [sys](bicep-functions.md#namespaces-for-functions).
9696

9797
### Remarks
9898

99-
Use this function when you have YAML content or minified YAML content that is stored in a separate file. Rather than duplicating the YAML content in your Bicep file, load the content with this function. You can load a part of a YAML file by specifying a path filer. The file is loaded when the Bicep file is compiled to the YAML template. You can't include variables in the file path because they haven't been resolved when compiling to the template. During deployment, the YAML template contains the contents of the file as a hard-coded string.
99+
Use this function when you have YAML content or minified YAML content that is stored in a separate file. Rather than duplicating the YAML content in your Bicep file, load the content with this function. You can load a part of a YAML file by specifying a path filter. The file is loaded when the Bicep file is compiled to the YAML template. You can't include variables in the file path because they haven't been resolved when compiling to the template. During deployment, the YAML template contains the contents of the file as a hard-coded string.
100100

101101
In VS Code, the properties of the loaded object are available intellisense. For example, you can create a file with values to share across many Bicep files. An example is shown in this article.
102102

‎articles/iot-hub-device-update/device-update-diagnostics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: Understand Device Update for Azure IoT Hub diagnostic features
33
description: Understand what diagnostic features Device Update for IoT Hub has, including deployment error codes in UX and remote log collection.
4-
author: chrisjlin
5-
ms.author: lichris
4+
author: vimeht
5+
ms.author: vimeht
66
ms.date: 9/2/2022
77
ms.topic: concept-article
88
ms.service: iot-hub-device-update

‎articles/iot-hub-device-update/device-update-log-collection.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
22
title: Device Update for Azure IoT Hub log collection | Microsoft Docs
33
description: Device Update for IoT Hub enables remote collection of diagnostic logs from connected IoT devices.
4-
author: chrisjlin
5-
ms.author: lichris
4+
author: vimeht
5+
ms.author: vimeht
66
ms.date: 10/26/2022
77
ms.topic: how-to
88
ms.service: iot-hub-device-update

‎articles/sap/automation/extensibility.md

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,22 @@ The Ansible playbooks must be named according to the following naming convention
4242

4343
'Playbook name_pre' for playbooks to be run before the SDAF playbook and 'Playbook name_post' for playbooks to be run after the SDAF playbook.
4444

45-
| Playbook name | Playbook name for 'pre' tasks | Playbook name for 'post' tasks | Description |
46-
| ----------------------------------------- | --------------------------------------------- | ---------------------------------------------- | ----------------------------------------------------------------- |
47-
| `playbook_01_os_base_config.yaml` | `playbook_01_os_base_config_pre.yaml` | `playbook_01_os_base_config_post.yaml` | Base operating system configuration |
48-
| `playbook_02_os_sap_specific_config.yaml` | `playbook_02_os_sap_specific_config_pre.yaml` | `playbook_02_os_sap_specific_config_post.yaml` | SAP specific configuration |
49-
| `playbook_03_bom_processing.yaml` | `playbook_03_bom_processing_pre.yaml` | `playbook_03_bom_processing_post.yaml` | Bill of Material processing |
50-
| `playbook_04_00_00_db_install.yaml` | `playbook_04_00_00_db_install_pre.yaml` | `playbook_04_00_00_db_install_post.yaml` | Database server installation |
51-
| `playbook_04_00_01_db_ha.yaml` | `playbook_04_00_01_db_ha_pre.yaml` | `playbook_04_00_01_db_ha_post.yaml` | Database High Availability configuration |
52-
| `playbook_05_00_00_sap_scs_install.yaml` | `playbook_05_00_00_sap_scs_install_pre.yaml` | `playbook_05_00_00_sap_scs_install_post.yaml` | Central Services Installation and High Availability configuration |
53-
| `playbook_05_01_sap_dbload.yaml` | `playbook_05_01_sap_dbload_pre.yaml` | `playbook_05_01_sap_dbload_post.yaml` | Database load |
54-
| `playbook_05_02_sap_pas_install.yaml` | `playbook_05_02_sap_pas_install_pre.yaml` | `playbook_05_02_sap_pas_install_post.yaml` | Primary Application Server installation |
55-
| `playbook_05_03_sap_app_install.yaml` | `playbook_05_03_sap_app_install_pre.yaml` | `playbook_05_03_sap_app_install_post.yaml` | Application Server installation |
56-
| `playbook_05_04_sap_web_install.yaml` | `playbook_05_04_sap_web_install_pre.yaml` | `playbook_05_04_sap_web_install.yaml` | Web dispatcher installation |
45+
| Playbook name | Playbook name for 'pre' tasks | Playbook name for 'post' tasks | Description |
46+
| ------------------------------------------------------- | ---------------------------------------------------------- | ----------------------------------------------------------- | ----------------------------------------------------------------- |
47+
| `playbook_01_os_base_config.yaml` | `playbook_01_os_base_config_pre.yaml` | `playbook_01_os_base_config_post.yaml` | Base operating system configuration |
48+
| `playbook_02_os_sap_specific_config.yaml` | `playbook_02_os_sap_specific_config_pre.yaml` | `playbook_02_os_sap_specific_config_post.yaml` | SAP specific configuration |
49+
| `playbook_03_bom_processing.yaml` | `playbook_03_bom_processing_pre.yaml` | `playbook_03_bom_processing_post.yaml` | Bill of Material processing |
50+
| `playbook_04_00_00_db_install.yaml` | `playbook_04_00_00_db_install_pre.yaml` | `playbook_04_00_00_db_install_post.yaml` | Database server installation |
51+
| `playbook_04_00_01_db_ha.yaml` | `playbook_04_00_01_db_ha_pre.yaml` | `playbook_04_00_01_db_ha_post.yaml` | Database High Availability configuration |
52+
| `playbook_05_00_00_sap_scs_install.yaml` | `playbook_05_00_00_sap_scs_install_pre.yaml` | `playbook_05_00_00_sap_scs_install_post.yaml` | Central Services Installation and High Availability configuration |
53+
| `playbook_05_01_sap_dbload.yaml` | `playbook_05_01_sap_dbload_pre.yaml` | `playbook_05_01_sap_dbload_post.yaml` | Database load |
54+
| `playbook_05_02_sap_pas_install.yaml` | `playbook_05_02_sap_pas_install_pre.yaml` | `playbook_05_02_sap_pas_install_post.yaml` | Primary Application Server installation |
55+
| `playbook_05_03_sap_app_install.yaml` | `playbook_05_03_sap_app_install_pre.yaml` | `playbook_05_03_sap_app_install_post.yaml` | Application Server installation |
56+
| `playbook_05_04_sap_web_install.yaml` | `playbook_05_04_sap_web_install_pre.yaml` | `playbook_05_04_sap_web_install_post.yaml` | Web dispatcher installation |
57+
| `playbook_08_00_00_post_configuration_actions.yaml` | `playbook_08_00_00_post_configuration_actions_pre.yml` | `playbook_08_00_00_post_configuration_actions_post.yml` | Post Configuration Actions |
5758

59+
> [!NOTE]
60+
> The playbook_08_00_00_post_configuration_actions.yaml step has no SDAF provided roles/tasks, it's only there to facilitate `_pre` and `_post` hooks after SDAF has completed the installation and configuration.
5861
5962
### Sample Ansible playbook
6063

0 commit comments

Comments
 (0)