Skip to content

Commit 0e610bf

Browse files
committed
Resolving merge conflict.
2 parents e0aa435 + 0a9c10a commit 0e610bf

File tree

4 files changed

+25
-17
lines changed

4 files changed

+25
-17
lines changed

articles/cost-management-billing/reservations/view-reservations.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ By default, the following users can view and manage reservations:
2626
- A Reservation administrator for reservations in their Azure Active Directory (Azure AD) tenant (directory)
2727
- A Reservation reader has read-only access to reservations in their Azure Active Directory tenant (directory)
2828

29-
Currently, the reservation administrator and reservation reader roles are only available to assign using PowerShell. They can't be viewed or assigned in the Azure portal. For more information, see [Grant access with PowerShell](#grant-access-with-powershell).
30-
3129
The reservation lifecycle is independent of an Azure subscription, so the reservation isn't a resource under the Azure subscription. Instead, it's a tenant-level resource with its own Azure RBAC permission separate from subscriptions. Reservations don't inherit permissions from subscriptions after the purchase.
3230

3331
## View and manage reservations
@@ -136,7 +134,14 @@ When you use the PowerShell script to assign the ownership role and it runs succ
136134
## Tenant-level access
137135
[User Access Administrator](../../role-based-access-control/built-in-roles.md#user-access-administrator) rights are required before you can grant users or groups the Reservation Administrator and Reservation Reader roles at the tenant level. In order to get User Access Administrator rights at the tenant level, follow [Elevate access](../../role-based-access-control/elevate-access-global-admin.md) steps.
138136

139-
## Add a Reservation Administrator role at the tenant level
137+
## Add a Reservation Administrator role or Reservation Reader role at the tenant level
138+
You can assign these roles from [Azure portal](https://portal.azure.com).
139+
140+
1. Sign in to the Azure portal and navigate to **Reservations**.
141+
2. At the top of the page, select **Role Assignment**.
142+
3. To make modifications, add user as a Reservation Administrator or Reservation Reader using Access control.
143+
144+
## Add a Reservation Administrator role at the tenant level using Azure PowerShell script
140145

141146
Use the following Azure PowerShell script to add a Reservation Administrator role at the tenant level with PowerShell.
142147

@@ -164,7 +169,7 @@ New-AzRoleAssignment -Scope "/providers/Microsoft.Capacity" -PrincipalId <Object
164169
- Accept pipeline input: False
165170
- Accept wildcard characters: False
166171

167-
## Assign a Reservation Reader role at the tenant level
172+
## Assign a Reservation Reader role at the tenant level using Azure PowerShell script
168173

169174
Use the following Azure PowerShell script to assign the Reservation Reader role at the tenant level with PowerShell.
170175

articles/virtual-desktop/move-resources.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ In this article, we'll tell you how to move Azure Virtual Desktop resources betw
1515
>This process doesn't perform an actual resource move. Instead, you delete the old resources and recreate them in the region you want to move the resources to. We recommend you test this process before using it on production workloads to understand how it will impact your deployment.
1616
1717
This process does not perform an actual resource move. Rather it does a delete and recreate in the new region which is different. Hence we recommend you test this process before using on production workloads to understand the impact of doing this.
18+
> [!NOTE]
19+
> This process does not perform an actual resource move. Rather it does a delete and recreate in the new region which is different. Hence we recommend you test this process before using on production workloads to understand the impact of doing this.
20+
>
21+
> The information in this article is applicable to all Azure Virtual Desktop resources, including host pools, application groups, scaling plans, and workspaces.
1822
1923
## Important information
2024

@@ -24,9 +28,11 @@ When you move Azure Virtual Desktop resources between regions, these are some th
2428

2529
- Workspaces and their associated app groups also need to be in the same region.
2630

31+
- Scaling plans and the host pools they are assigned to also need to be in the same region.
32+
2733
- All resources to be moved have to be in the same resource group. Template exports require having resources in the same group, so if you want them to be in a different location, you'll need to modify the exported template to change the location of its resources.
2834

29-
- Once you're done moving your resources to a new region, you must delete the original resources. The resource ID of our resources won't change during the moving process, so there will be a name conflict with your old resources if you don't delete them.
35+
- Once you're done moving your resources to a new region, you must delete the original resources. The resource ID of your resources won't change during the moving process, so there will be a name conflict with your old resources if you don't delete them.
3036

3137
- Existing session hosts attached to a host pool that you move will stop working. You'll need to recreate the session hosts in the new region.
3238

@@ -56,7 +62,7 @@ To modify the template you exported:
5662

5763
2. In each resource inside the template file, find the "location" property and modify it to the location you want to move them to. For example, if your deployment's currently in the East US region but you want to move it to the West US region, you'd change the "eastus" location to "westus." Learn more about which Azure regions you can use at [Azure geographies](https://azure.microsoft.com/global-infrastructure/geographies/#geographies).
5864

59-
3. For each host pool, remove the "publicNetworkAccess" parameter, if present.
65+
3. If you are moving a host pool, remove the "publicNetworkAccess" parameter, if present.
6066

6167
## Delete original resources
6268

articles/virtual-desktop/teams-on-avd.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ manager: femila
99
---
1010
# Use Microsoft Teams on Azure Virtual Desktop
1111

12-
>[!IMPORTANT]
13-
>Media optimization for Teams is supported for Microsoft 365 Government (GCC) and GCC-High environments. Media optimization for Teams isn't supported for Microsoft 365 DoD.
14-
1512
>[!NOTE]
1613
>Media optimization for Microsoft Teams is only available for the following two clients:
1714
>
@@ -48,7 +45,7 @@ To enable media optimization for Teams, set the following registry key on the ho
4845

4946
### Install the Teams WebSocket Service
5047

51-
Install the latest version of the [Remote Desktop WebRTC Redirector Service](https://query.prod.cms.rt.microsoft.com/cms/api/am/binary/RE4YM8L) on your VM image. If you encounter an installation error, install the [latest Microsoft Visual C++ Redistributable](https://support.microsoft.com/help/2977003/the-latest-supported-visual-c-downloads) and try again.
48+
Install the latest version of the [Remote Desktop WebRTC Redirector Service](https://aka.ms/msrdcwebrtcsvc/msi) on your VM image. If you encounter an installation error, install the [latest Microsoft Visual C++ Redistributable](https://support.microsoft.com/help/2977003/the-latest-supported-visual-c-downloads) and try again.
5249

5350
#### Latest WebSocket Service versions
5451

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
---
22
author: cherylmc
33
ms.author: cherylmc
4-
ms.date: 05/16/2022
4+
ms.date: 07/29/2022
55
ms.service: vpn-gateway
66
ms.topic: include
77
---
88

99
| Authentication | Tunnel type | HowTo article |
1010
| --- | --- | --- |
11-
| Azure certificate | IKEv2, OpenVPN, SSTP | [Windows clients](../articles/vpn-gateway/point-to-site-vpn-client-cert-windows.md)|
12-
| Azure certificate | IKEv2, OpenVPN |[macOS-iOS clients](../articles/vpn-gateway/point-to-site-vpn-client-cert-mac.md)|
13-
| Azure certificate | IKEv2, OpenVPN | [Linux clients](../articles/vpn-gateway/point-to-site-vpn-client-cert-linux.md) |
14-
| Azure AD |OpenVPN (SSL) | [Windows clients](../articles/vpn-gateway/openvpn-azure-ad-client.md) |
15-
| Azure AD | OpenVPN (SSL)| [macOS clients](../articles/vpn-gateway/openvpn-azure-ad-client-mac.md) |
11+
| Azure certificate | IKEv2, OpenVPN, SSTP | [Windows](../articles/vpn-gateway/point-to-site-vpn-client-cert-windows.md)|
12+
| Azure certificate | IKEv2, OpenVPN |[macOS-iOS](../articles/vpn-gateway/point-to-site-vpn-client-cert-mac.md)|
13+
| Azure certificate | IKEv2, OpenVPN | [Linux](../articles/vpn-gateway/point-to-site-vpn-client-cert-linux.md) |
14+
| Azure AD |OpenVPN (SSL) | [Windows](../articles/vpn-gateway/openvpn-azure-ad-client.md) |
15+
| Azure AD | OpenVPN (SSL)| [macOS](../articles/vpn-gateway/openvpn-azure-ad-client-mac.md) |
1616
| RADIUS - certificate | - |[Article](../articles/vpn-gateway/point-to-site-vpn-client-configuration-radius-certificate.md)|
1717
| RADIUS - password | - |[Article](../articles/vpn-gateway/point-to-site-vpn-client-configuration-radius-password.md)|
18-
| RADIUS - other methods | - |[Article](../articles/vpn-gateway/point-to-site-vpn-client-configuration-radius-other.md)|
18+
| RADIUS - other methods | - |[Article](../articles/vpn-gateway/point-to-site-vpn-client-configuration-radius-other.md)|

0 commit comments

Comments
 (0)