Skip to content

Commit 2eb2e36

Browse files
authored
Merge pull request #234740 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 1e7fefb + 9ca8d9c commit 2eb2e36

12 files changed

+118
-75
lines changed

articles/active-directory/multi-tenant-organizations/cross-tenant-synchronization-configure.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -522,6 +522,28 @@ $smssignin = Get-MgUserAuthenticationPhoneMethod -UserId $userId
522522
##### End the script
523523
```
524524

525+
#### Symptom - Users fail to provision with error "AzureActiveDirectoryForbidden"
526+
527+
Users in scope fail to provision. The provisioning logs details include the following error message:
528+
529+
```
530+
The provisioning service was forbidden from performing an operation on Azure Active Directory, which is unusual.
531+
A simultaneous change to the target object may have occurred, in which case, the operation might succeed when it is retried.
532+
Alternatively, the target of the operation, or one of its properties, may be mastered on-premises, in which case,
533+
the provisioning service is not permitted to update it, and the corresponding source entry should be removed from the provisioning service's scope.
534+
Otherwise, authorizations may have been customized in such a way as to prevent the provisioning service from modifying the target object or one of its properties;
535+
if so, then, again, the corresponding source entry should be removed from scope.
536+
This operation was retried 0 times.
537+
```
538+
539+
**Cause**
540+
541+
This error indicates the Guest invite settings in the target tenant are configured with the most restrictive setting: "No one in the organization can invite guest users including admins (most restrictive)".
542+
543+
**Solution**
544+
545+
Change the Guest invite settings in the target tenant to a less restrictive setting. For more information, see [Configure external collaboration settings](../external-identities/external-collaboration-settings-configure.md).
546+
525547
## Next steps
526548

527549
- [Tutorial: Reporting on automatic user account provisioning](../app-provisioning/check-status-user-account-provisioning.md)

articles/aks/azure-csi-disk-storage-provision.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -130,30 +130,30 @@ Once the persistent volume claim has been created and the disk successfully prov
130130

131131
1. Create a file named `azure-pvc-disk.yaml`, and copy in the following manifest:
132132

133-
```yaml
134-
kind: Pod
135-
apiVersion: v1
136-
metadata:
137-
name: mypod
138-
spec:
139-
containers:
140-
- name: mypod
133+
```yaml
134+
kind: Pod
135+
apiVersion: v1
136+
metadata:
137+
name: mypod
138+
spec:
139+
containers:
140+
- name: mypod
141141
image: mcr.microsoft.com/oss/nginx/nginx:1.15.5-alpine
142142
resources:
143143
requests:
144-
cpu: 100m
145-
memory: 128Mi
144+
cpu: 100m
145+
memory: 128Mi
146146
limits:
147147
cpu: 250m
148148
memory: 256Mi
149149
volumeMounts:
150-
- mountPath: "/mnt/azure"
151-
name: volume
152-
volumes:
153-
- name: volume
154-
persistentVolumeClaim:
155-
claimName: azure-managed-disk
156-
```
150+
- mountPath: "/mnt/azure"
151+
name: volume
152+
volumes:
153+
- name: volume
154+
persistentVolumeClaim:
155+
claimName: azure-managed-disk
156+
```
157157

158158
2. Create the pod with the [kubectl apply][kubectl-apply] command, as shown in the following example:
159159

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
2-
title: Manage your Azure Maps account's pricing tier | Microsoft Azure Maps
2+
title: Manage your Azure Maps account's pricing tier
3+
titleSuffix: Microsoft Azure Maps
34
description: You can use the Azure portal to manage your Microsoft Azure Maps account and its pricing tier.
45
author: eriklindeman
56
ms.author: eriklind
@@ -11,12 +12,12 @@ services: azure-maps
1112

1213
# Manage the pricing tier of your Azure Maps account
1314

14-
You can manage the pricing tier of your Azure Maps account through the Azure portal. You can also view or change your account's pricing tier after you create an [account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
15+
You can manage the pricing tier of your Azure Maps account through the Azure portal. You can also view or change your account's pricing tier after you create an [Azure account].
1516

16-
Get more information about [choosing the right pricing tier in Azure Maps](./choose-pricing-tier.md).
17+
Get more information about [choosing the right pricing tier in Azure Maps].
1718

18-
>[!NOTE]
19-
>Switching to Gen 1 pricing tier is not available for Gen 2 Azure Maps Creator customers. Gen 1 Azure Maps Creator will be deprecated on 8/6/2021.
19+
> [!NOTE]
20+
> Switching to Gen 1 pricing tier is not available for Gen 2 Azure Maps Creator customers. Gen 1 Azure Maps Creator will be deprecated on 8/6/2021.
2021
2122
## View your pricing tier
2223

@@ -26,19 +27,20 @@ To view your chosen pricing tier, navigate to the **Pricing Tier** option in the
2627

2728
## Change a pricing tier
2829

29-
After you create your Azure Maps account, you can upgrade or downgrade the pricing tier for your Azure Maps account. To upgrade or downgrade, navigate to the **Pricing Tier** option in the settings menu. Select the pricing tier from drop down list. Note – current pricing tier will be default selection. Select the **Save** button to save your chosen pricing tier option.
30+
After you create your Azure Maps account, you can upgrade or downgrade the pricing tier for your Azure Maps account. To upgrade or downgrade, navigate to the **Pricing Tier** option in the settings menu. Select the pricing tier from drop down list. Note – current pricing tier is the default selection. Select the **Save** button to save your chosen pricing tier option.
3031

3132
> [!NOTE]
3233
> You don't have to generate new subscription keys or client ID (for Azure AD authentication) if you upgrade or downgrade the pricing tier for your Azure Maps account.
3334
34-
3535
:::image type="content" source="./media/how-to-manage-pricing-tier/change-pricing-tier.png" border="true" alt-text="Change a pricing tier":::
3636

37-
38-
3937
## Next steps
4038

4139
Learn how to see the API usage metrics for your Azure Maps account:
4240

43-
> [!div class="nextstepaction"]
44-
> [View usage metrics](./how-to-view-api-usage.md)
41+
> [!div class="nextstepaction"]
42+
> [View usage metrics]
43+
44+
[Azure account]: https://azure.microsoft.com/free/?WT.mc_id=A261C142F
45+
[View usage metrics]: how-to-view-api-usage.md
46+
[choosing the right pricing tier in Azure Maps]: choose-pricing-tier.md

0 commit comments

Comments
 (0)