Skip to content

Commit

Permalink
Changes to be committed:
Browse files Browse the repository at this point in the history 
	modified:   workload/arm/deploy-baseline.json
	modified:   workload/bicep/deploy-baseline.bicep
  • Loading branch information
@danycontre
danycontre committed Jun 14, 2023
1 parent 7068489 commit bc7e92d
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 42 deletions.
36 changes: 18 additions & 18 deletions workload/arm/deploy-baseline.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
"_generator": {
"name": "bicep",
"version": "0.17.1.54307",
"templateHash": "7604142135717494177"
"templateHash": "9174993714236485423"
}
},
"parameters": {
"deploymentPrefix": {
"type": "string",
"defaultValue": "AVD1",
"metadata": {
"description": "Optional. The name of the resource group to deploy. (Default: )"
"description": "Optional. The name of the resource group to deploy. (Default: AVD1)"
},
"maxLength": 4,
"minLength": 2
Expand Down Expand Up @@ -57,14 +57,14 @@
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Required. AVD workload subscription ID, multiple subscriptions scenario. (Default: )"
"description": "Required. AVD workload subscription ID, multiple subscriptions scenario. (Default: \"\")"
}
},
"avdEnterpriseAppObjectId": {
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Required. Azure Virtual Desktop Enterprise Application object ID. (Default: )"
"description": "Required. Azure Virtual Desktop Enterprise Application object ID. (Default: \"\")"
}
},
"avdVmLocalUserName": {
Expand Down Expand Up @@ -109,7 +109,7 @@
"type": "string",
"defaultValue": "Group",
"metadata": {
"description": "Optional, Identity type to grant RBAC role to access AVD application group. (Defualt: \"\")"
"description": "Optional, Identity type to grant RBAC role to access AVD application group. (Defualt: Group)"
},
"allowedValues": [
"Group",
Expand All @@ -127,21 +127,21 @@
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Required. AD domain GUID."
"description": "Required. AD domain GUID. (Defualt: \"\")"
}
},
"avdDomainJoinUserName": {
"type": "string",
"defaultValue": "none",
"metadata": {
"description": "Required. AVD session host domain join user principal name. (Defualt: \"none\")"
"description": "Required. AVD session host domain join user principal name. (Defualt: none)"
}
},
"avdDomainJoinUserPassword": {
"type": "securestring",
"defaultValue": "none",
"metadata": {
"description": "Required. AVD session host domain join password. (Defualt: \"none\")"
"description": "Required. AVD session host domain join password. (Defualt: none)"
}
},
"avdOuPath": {
Expand Down Expand Up @@ -244,7 +244,7 @@
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Required. Existing hub virtual network for perring."
"description": "Required. Existing hub virtual network for perring. (Default: \"\")"
}
},
"avdVnetworkAddressPrefixes": {
Expand Down Expand Up @@ -272,7 +272,7 @@
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Optional. custom DNS servers IPs."
"description": "Optional. custom DNS servers IPs. (Default: \"\")"
}
},
"deployPrivateEndpointKeyvaultStorage": {
Expand Down Expand Up @@ -319,7 +319,7 @@
},
"createMsixDeployment": {
"type": "bool",
"defaultValue": true,
"defaultValue": false,
"metadata": {
"description": "Optional. Deploy MSIX App Attach setup. (Default: false)"
}
Expand All @@ -328,14 +328,14 @@
"type": "int",
"defaultValue": 10,
"metadata": {
"description": "Optional. Fslogix file share size. (Default: ~1TB)"
"description": "Optional. Fslogix file share size. (Default: 10)"
}
},
"msixFileShareQuotaSize": {
"type": "int",
"defaultValue": 10,
"metadata": {
"description": "Optional. MSIX file share size. (Default: ~1TB)"
"description": "Optional. MSIX file share size. (Default: 10)"
}
},
"avdDeploySessionHosts": {
Expand All @@ -354,7 +354,7 @@
},
"deployAlaWorkspace": {
"type": "bool",
"defaultValue": false,
"defaultValue": true,
"metadata": {
"description": "Optional. Deploy AVD Azure log analytics workspace. (Default: true)"
}
Expand All @@ -363,7 +363,7 @@
"type": "bool",
"defaultValue": false,
"metadata": {
"description": "Required. Create and assign custom Azure Policy for diagnostic settings for the AVD Log Analytics workspace."
"description": "Required. Create and assign custom Azure Policy for diagnostic settings for the AVD Log Analytics workspace. (Default: false)"
}
},
"avdAlaWorkspaceDataRetention": {
Expand All @@ -377,7 +377,7 @@
"type": "string",
"defaultValue": "",
"metadata": {
"description": "Optional. Existing Azure log analytics workspace resource ID to connect to. (Default: )"
"description": "Optional. Existing Azure log analytics workspace resource ID to connect to. (Default: \"\")"
}
},
"avdDeploySessionHostsCount": {
Expand Down Expand Up @@ -407,7 +407,7 @@
"type": "int",
"defaultValue": 2,
"metadata": {
"description": "Optional. Sets the number of fault domains for the availability set. (Defualt: 3)"
"description": "Optional. Sets the number of fault domains for the availability set. (Defualt: 2)"
}
},
"avdAsUpdateDomainCount": {
Expand Down Expand Up @@ -535,7 +535,7 @@
"type": "bool",
"defaultValue": false,
"metadata": {
"description": "Optional. If OU for Azure Storage needs to be created - set to true and ensure the domain join credentials have priviledge to create OU and create computer objects or join to domain. (Default: \"\")"
"description": "Optional. If OU for Azure Storage needs to be created - set to true and ensure the domain join credentials have priviledge to create OU and create computer objects or join to domain. (Default: false)"
}
},
"avdUseCustomNaming": {
Expand Down
41 changes: 17 additions & 24 deletions workload/bicep/deploy-baseline.bicep
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ targetScope = 'subscription'

@minLength(2)
@maxLength(4)
@description('Optional. The name of the resource group to deploy. (Default: )')
@description('Optional. The name of the resource group to deploy. (Default: AVD1)')
param deploymentPrefix string = 'AVD1'

@allowed([
Expand All @@ -28,10 +28,10 @@ param avdSessionHostLocation string = 'eastus2'
@description('Optional. Location where to deploy AVD management plane. (Default: eastus2)')
param avdManagementPlaneLocation string = 'eastus2'

@description('Required. AVD workload subscription ID, multiple subscriptions scenario. (Default: )')
@description('Required. AVD workload subscription ID, multiple subscriptions scenario. (Default: "")')
param avdWorkloadSubsId string = ''

@description('Required. Azure Virtual Desktop Enterprise Application object ID. (Default: )')
@description('Required. Azure Virtual Desktop Enterprise Application object ID. (Default: "")')
param avdEnterpriseAppObjectId string = ''

@description('Required. AVD session host local username.')
Expand Down Expand Up @@ -60,19 +60,19 @@ param avdApplicationGroupIdentitiesIds string = ''
'ServicePrincipal'
'User'
])
@description('Optional, Identity type to grant RBAC role to access AVD application group. (Defualt: "")')
@description('Optional, Identity type to grant RBAC role to access AVD application group. (Defualt: Group)')
param avdApplicationGroupIdentityType string = 'Group'

@description('Required. AD domain name.')
param avdIdentityDomainName string

@description('Required. AD domain GUID.')
@description('Required. AD domain GUID. (Defualt: "")')
param identityDomainGuid string = ''

@description('Required. AVD session host domain join user principal name. (Defualt: "none")')
@description('Required. AVD session host domain join user principal name. (Defualt: none)')
param avdDomainJoinUserName string = 'none'

@description('Required. AVD session host domain join password. (Defualt: "none")')
@description('Required. AVD session host domain join password. (Defualt: none)')
@secure()
param avdDomainJoinUserPassword string = 'none'

Expand Down Expand Up @@ -124,7 +124,7 @@ param existingVnetAvdSubnetResourceId string = ''
@description('Optional. Existing virtual network subnet for private endpoints. (Default: "")')
param existingVnetPrivateEndpointSubnetResourceId string = ''

@description('Required. Existing hub virtual network for perring.')
@description('Required. Existing hub virtual network for perring. (Default: "")')
param existingHubVnetResourceId string = ''

@description('Optional. AVD virtual network address prefixes. (Default: 10.10.0.0/23)')
Expand All @@ -136,7 +136,7 @@ param vNetworkAvdSubnetAddressPrefix string = '10.10.0.0/24'
@description('Optional. private endpoints virtual network subnet address prefix. (Default: 10.10.1.0/27)')
param vNetworkPrivateEndpointSubnetAddressPrefix string = '10.10.1.0/27'

@description('Optional. custom DNS servers IPs.')
@description('Optional. custom DNS servers IPs. (Default: "")')
param customDnsIps string = ''

@description('Optional. Deploy private endpoints for key vault and storage. (Default: true)')
Expand All @@ -158,12 +158,12 @@ param vNetworkGatewayOnHub bool = false
param createAvdFslogixDeployment bool = true

@description('Optional. Deploy MSIX App Attach setup. (Default: false)')
param createMsixDeployment bool = true
param createMsixDeployment bool = false

@description('Optional. Fslogix file share size. (Default: ~1TB)')
@description('Optional. Fslogix file share size. (Default: 10)')
param fslogixFileShareQuotaSize int = 10

@description('Optional. MSIX file share size. (Default: ~1TB)')
@description('Optional. MSIX file share size. (Default: 10)')
param msixFileShareQuotaSize int = 10

@description('Optional. Deploy new session hosts. (Default: true)')
Expand All @@ -173,15 +173,15 @@ param avdDeploySessionHosts bool = true
param avdDeployMonitoring bool = false

@description('Optional. Deploy AVD Azure log analytics workspace. (Default: true)')
param deployAlaWorkspace bool = false
param deployAlaWorkspace bool = true

@description('Required. Create and assign custom Azure Policy for diagnostic settings for the AVD Log Analytics workspace.')
@description('Required. Create and assign custom Azure Policy for diagnostic settings for the AVD Log Analytics workspace. (Default: false)')
param deployCustomPolicyMonitoring bool = false

@description('Optional. AVD Azure log analytics workspace data retention. (Default: 90)')
param avdAlaWorkspaceDataRetention int = 90

@description('Optional. Existing Azure log analytics workspace resource ID to connect to. (Default: )')
@description('Optional. Existing Azure log analytics workspace resource ID to connect to. (Default: "")')
param alaExistingWorkspaceResourceId string = ''

@minValue(1)
Expand All @@ -195,10 +195,7 @@ param avdSessionHostCountIndex int = 0
@description('Optional. Creates an availability zone and adds the VMs to it. Cannot be used in combination with availability set nor scale set. (Defualt: true)')
param avdUseAvailabilityZones bool = true

//@description('Optional. Creates an availability zone for MSIXand adds the VMs to it. Cannot be used in combination with availability set nor scale set. (Defualt: true) test')
//param avdMsixUseAvailabilityZones bool = true

@description('Optional. Sets the number of fault domains for the availability set. (Defualt: 3)')
@description('Optional. Sets the number of fault domains for the availability set. (Defualt: 2)')
param avdAsFaultDomainCount int = 2

@description('Optional. Sets the number of update domains for the availability set. (Defualt: 5)')
Expand Down Expand Up @@ -269,7 +266,7 @@ param avdImageTemplateDefinitionId string = ''
@description('Optional. OU name for Azure Storage Account. It is recommended to create a new AD Organizational Unit (OU) in AD and disable password expiration policy on computer accounts or service logon accounts accordingly. (Default: "")')
param storageOuPath string = ''

@description('Optional. If OU for Azure Storage needs to be created - set to true and ensure the domain join credentials have priviledge to create OU and create computer objects or join to domain. (Default: "")')
@description('Optional. If OU for Azure Storage needs to be created - set to true and ensure the domain join credentials have priviledge to create OU and create computer objects or join to domain. (Default: false)')
param createOuForStorage bool = false

// Custom Naming
Expand Down Expand Up @@ -305,10 +302,6 @@ param avdVnetworkCustomName string = 'vnet-app1-dev-use2-001'
@description('Optional. AVD Azure log analytics workspace custom name. (Default: log-avd-app1-dev-use2)')
param avdAlaWorkspaceCustomName string = 'log-avd-app1-dev-use2'

//@maxLength(24)
//@description('Optional. Azure Storage Account custom name for NSG flow logs. (Default: stavduse2flowlogs001)')
//param avdStgAccountForFlowLogsCustomName string = 'stavduse2flowlogs001'

@maxLength(80)
@description('Optional. AVD virtual network subnet custom name. (Default: snet-avd-app1-dev-use2-001)')
param avdVnetworkSubnetCustomName string = 'snet-avd-app1-dev-use2-001'
Expand Down

0 comments on commit bc7e92d

Please sign in to comment.