Skip to content

Commit a0a6670

Browse files
Merge pull request #227199 from Blackmist/revert-227027-conditional-access
Revert "Flagging as unsupported"
2 parents 2a3c2a3 + 987ca9b commit a0a6670

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

articles/machine-learning/how-to-integrate-azure-policy.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ You can also assign policies by using [Azure PowerShell](../governance/policy/as
5454

5555
## Conditional access policies
5656

57+
To control who can access your Azure Machine Learning workspace, use Azure Active Directory [Conditional Access](../active-directory/conditional-access/overview.md).
58+
5759
> [!IMPORTANT]
58-
> [Azure AD Conditional Access](/azure/active-directory/conditional-access/overview) is __not__ supported with Azure Machine Learning.
60+
> Azure Machine Learning studio cannot be added in cloud apps in Azure AD Conditional Access, as the studio UI is a client application.
5961
6062
## Enable self-service using landing zones
6163

articles/machine-learning/how-to-setup-authentication.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Learn how to set up authentication to your Azure Machine Learning workspace from
3333

3434
Regardless of the authentication workflow used, Azure role-based access control (Azure RBAC) is used to scope the level of access (authorization) allowed to the resources. For example, an admin or automation process might have access to create a compute instance, but not use it, while a data scientist could use it, but not delete or create it. For more information, see [Manage access to Azure Machine Learning workspace](how-to-assign-roles.md).
3535

36+
Azure AD Conditional Access can be used to further control or restrict access to the workspace for each authentication workflow. For example, an admin can allow workspace access from managed devices only.
37+
3638
## Prerequisites
3739

3840
* Create an [Azure Machine Learning workspace](how-to-manage-workspace.md).
@@ -314,8 +316,11 @@ print(ml_client)
314316

315317
## Use Conditional Access
316318

319+
As an administrator, you can enforce [Azure AD Conditional Access policies](../active-directory/conditional-access/overview.md) for users signing in to the workspace. For example, you
320+
can require two-factor authentication, or allow sign in only from managed devices. To use Conditional Access for Azure Machine Learning workspaces specifically, [assign the Conditional Access policy](../active-directory/conditional-access/concept-conditional-access-cloud-apps.md) to Machine Learning Cloud app.
321+
317322
> [!IMPORTANT]
318-
> [Azure AD Conditional Access](/azure/active-directory/conditional-access/overview) is __not__ supported with Azure Machine Learning.
323+
> Azure Machine Learning studio cannot be added in cloud apps in Azure AD Conditional Access, as the studio UI is a client application.
319324
320325
## Next steps
321326

articles/machine-learning/v1/how-to-setup-authentication.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Learn how to set up authentication to your Azure Machine Learning workspace. Aut
3333

3434
Regardless of the authentication workflow used, Azure role-based access control (Azure RBAC) is used to scope the level of access (authorization) allowed to the resources. For example, an admin or automation process might have access to create a compute instance, but not use it, while a data scientist could use it, but not delete or create it. For more information, see [Manage access to Azure Machine Learning workspace](../how-to-assign-roles.md).
3535

36+
Azure AD Conditional Access can be used to further control or restrict access to the workspace for each authentication workflow. For example, an admin can allow workspace access from managed devices only.
37+
3638
## Prerequisites
3739

3840
* Create an [Azure Machine Learning workspace](../how-to-manage-workspace.md).
@@ -252,8 +254,11 @@ ws = Workspace(subscription_id="your-sub-id",
252254

253255
## Use Conditional Access
254256

257+
As an administrator, you can enforce [Azure AD Conditional Access policies](../../active-directory/conditional-access/overview.md) for users signing in to the workspace. For example, you
258+
can require two-factor authentication, or allow sign in only from managed devices. To use Conditional Access for Azure Machine Learning workspaces specifically, [assign the Conditional Access policy](../../active-directory/conditional-access/concept-conditional-access-cloud-apps.md) to Machine Learning Cloud app.
259+
255260
> [!IMPORTANT]
256-
> [Azure AD Conditional Access](/azure/active-directory/conditional-access/overview) is __not__ supported with Azure Machine Learning.
261+
> Azure Machine Learning studio cannot be added in cloud apps in Azure AD Conditional Access, as the studio UI is a client application.
257262
258263
## Next steps
259264

0 commit comments

Comments
 (0)