Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aadds name update #517

Merged
merged 4 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion workload/bicep/deploy-baseline.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ param avdVmLocalUserPassword string

@allowed([
'ADDS' // Active Directory Domain Services
'AADDS' // Azure Active Directory Domain Services
'AADDS' // Microsoft Entra Domain Services
'AAD' // Microsoft Entra ID Join
])
@sys.description('Required, The service providing domain services for Azure Virtual Desktop. (Default: ADDS)')
Expand Down
38 changes: 17 additions & 21 deletions workload/docs/autoGenerated/deploy-baseline.bicep.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ avdVmLocalUserName | Yes | AVD session host local username.
avdVmLocalUserPassword | Yes | AVD session host local password.
avdIdentityServiceProvider | No | Required, The service providing domain services for Azure Virtual Desktop. (Default: ADDS)
createIntuneEnrollment | No | Required, Eronll session hosts on Intune. (Default: false)
avdApplicationGroupIdentitiesIds | No | Optional, Identity ID array to grant RBAC role to access AVD application group. (Default: "")
avdApplicationGroupIdentityType | No | Optional, Identity type to grant RBAC role to access AVD application group. (Default: Group)
avdIdentityDomainName | Yes | AD domain name.
securityPrincipalId | No | Optional, Identity ID to grant RBAC role to access AVD application group and NTFS permissions. (Default: "")
securityPrincipalName | No | Optional, Identity name to grant RBAC role to access AVD application group and NTFS permissions. (Default: "")
identityDomainName | No | FQDN of on-premises AD domain, used for FSLogix storage configuration and NTFS setup. (Default: "")
identityDomainGuid | No | AD domain GUID. (Default: "")
avdDomainJoinUserName | No | AVD session host domain join user principal name. (Default: none)
avdDomainJoinUserPassword | No | AVD session host domain join password. (Default: none)
Expand Down Expand Up @@ -59,7 +59,7 @@ alaExistingWorkspaceResourceId | No | Existing Azure log analytics workspa
avdDeploySessionHostsCount | No | Quantity of session hosts to deploy. (Default: 1)
avdSessionHostCountIndex | No | The session host number to begin with for the deployment. This is important when adding virtual machines to ensure the names do not conflict. (Default: 0)
availabilityZonesCompute | No | When true VMs are distributed across availability zones, when set to false, VMs will be members of a new availability set. (Default: true)
zoneRedundantStorage | No | When true, ZOne Redudant Storage (ZRS) is used, when set to false, Locally Redundant Storage (LRS) is used. (Default: false)
zoneRedundantStorage | No | When true, Zone Redundant Storage (ZRS) is used, when set to false, Locally Redundant Storage (LRS) is used. (Default: false)
avsetFaultDomainCount | No | Sets the number of fault domains for the availability set. (Default: 2)
avsetUpdateDomainCount | No | Sets the number of update domains for the availability set. (Default: 5)
fslogixStoragePerformance | No | Storage account SKU for FSLogix storage. Recommended tier is Premium (Default: Premium)
Expand Down Expand Up @@ -206,27 +206,23 @@ Required, Eronll session hosts on Intune. (Default: false)

- Default value: `False`

### avdApplicationGroupIdentitiesIds
### securityPrincipalId

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)

Optional, Identity ID array to grant RBAC role to access AVD application group. (Default: "")
Optional, Identity ID to grant RBAC role to access AVD application group and NTFS permissions. (Default: "")

### avdApplicationGroupIdentityType
### securityPrincipalName

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)

Optional, Identity type to grant RBAC role to access AVD application group. (Default: Group)
Optional, Identity name to grant RBAC role to access AVD application group and NTFS permissions. (Default: "")

- Default value: `Group`
### identityDomainName

- Allowed values: `Group`, `ServicePrincipal`, `User`

### avdIdentityDomainName

![Parameter Setting](https://img.shields.io/badge/parameter-required-orange?style=flat-square)
![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)

AD domain name.
FQDN of on-premises AD domain, used for FSLogix storage configuration and NTFS setup. (Default: "")

### identityDomainGuid

Expand Down Expand Up @@ -534,7 +530,7 @@ When true VMs are distributed across availability zones, when set to false, VMs

![Parameter Setting](https://img.shields.io/badge/parameter-optional-green?style=flat-square)

When true, ZOne Redudant Storage (ZRS) is used, when set to false, Locally Redundant Storage (LRS) is used. (Default: false)
When true, Zone Redundant Storage (ZRS) is used, when set to false, Locally Redundant Storage (LRS) is used. (Default: false)

- Default value: `False`

Expand Down Expand Up @@ -1089,13 +1085,13 @@ Enable usage and telemetry feedback to Microsoft.
"createIntuneEnrollment": {
"value": false
},
"avdApplicationGroupIdentitiesIds": {
"value": []
"securityPrincipalId": {
"value": ""
},
"avdApplicationGroupIdentityType": {
"value": "Group"
"securityPrincipalName": {
"value": ""
},
"avdIdentityDomainName": {
"identityDomainName": {
"value": ""
},
"identityDomainGuid": {
Expand Down
2 changes: 1 addition & 1 deletion workload/docs/deploy-baseline.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
- **Identity Service Provider** - Identity service provider (AD DS, AAD DS, AAD) that already exists and will be used for Azure Virtual Desktop.
- Microsoft Entra ID.
- Active Directory (AD DS).
- Azure Active Directory Domain Services (AAD DS).
- Microsoft Entra Domain Services.
- **Azure Virtual Desktop access assignment** - These identities will be granted access to Azure Virtual Desktop application groups (role "Desktop Virtualization User").
- Groups - select from the drop down the groups to be granted access to Azure Virtual Desktop published items and to create sessions on VMs and single sign-on (SSO) when using AAD as identity provider.
- Note: when using AAD as identity service provider, an additional role (virtual machine user login) will be granted to compute resource group during deployment.
Expand Down
2 changes: 1 addition & 1 deletion workload/portal-ui/portal-ui-baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
"value": "ADDS"
},
{
"label": "Azure AD Domain Services (AAD DS)",
"label": "Microsoft Entra Domain Services",
"value": "AADDS"
}
]
Expand Down