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

Shared image gallery #1

Merged
merged 2 commits into from Nov 15, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file or symbol
Failed to load files and symbols.

Always

Just for now

@@ -23,11 +23,40 @@
},
"defaultValue": "Gallery",
"allowedValues": [
"SharedImageGallery",
"CustomVHD",
"CustomImage",
"Gallery"
]
},
"SharedImageGalleryResourceGroup": {
"type": "string",
"metadata": {
"description": "(Required when rdshImageSrouce = SharedImageGallery) ResourceGroup name of the Shared Image Gallery"
},
"defaultValue": ""
},
"SharedImageGalleryName": {
"type": "string",
"metadata": {
"description": "(Required when rdshImageSrouce = SharedImageGallery) Name of the Shared Image Gallery."
},
"defaultValue": ""
},
"SharedImageGalleryDefinitionName": {
"type": "string",
"metadata": {
"description": "(Required when rdshImageSrouce = SharedImageGallery) Name of the Image Definition."
},
"defaultValue": ""
},
"SharedImageGalleryVersionName": {
"type": "string",
"metadata": {
"description": "(Required when rdshImageSrouce = SharedImageGallery) Name of the Image Version - should follow <MajorVersion>.<MinorVersion>.<Patch>."
},
"defaultValue": ""
},
"vmImageVhdUri": {
"type": "string",
"metadata": {
@@ -44,7 +73,8 @@
"Windows-10-Enterprise-multi-session-with-Office-365-ProPlus",
"Windows-10-Enterprise-multi-session",
"Windows-10-Enterprise-1903",
"2016-Datacenter"
"2016-Datacenter",
"2019-Datacenter"
],
"defaultValue": "Windows-10-Enterprise-multi-session-with-Office-365-ProPlus"
},
@@ -92,7 +122,7 @@
"metadata": {
"description": "The size of the session host VMs."
},
"defaultValue": "Standard_D4s_v3"
"defaultValue": "Standard_D2s_v3"
},
"enableAcceleratedNetworking": {
"type": "bool",
@@ -314,6 +344,18 @@
"storageAccountResourceGroupName": {
"value": "[parameters('storageAccountResourceGroupName')]"
},
"SharedImageGalleryResourceGroup": {
"value": "[parameters('SharedImageGalleryResourceGroup')]"
},
"SharedImageGalleryName": {
"value": "[parameters('SharedImageGalleryName')]"
},
"SharedImageGalleryDefinitionName":{
"value": "[parameters('SharedImageGalleryDefinitionName')]"
},
"SharedImageGalleryVersionName":{
"value": "[parameters('SharedImageGalleryVersionName')]"
},
"rdshGalleryImageSKU": {
"value": "[parameters('rdshGalleryImageSKU')]"
},
@@ -0,0 +1,94 @@
{
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
"contentVersion": "1.0.0.0",
"parameters": {
"_artifactsLocation": {
"value": "https://raw.githubusercontent.com/Everink/RDS-Templates/master/wvd-templates/Create%20and%20provision%20WVD%20host%20pool/"
},
"rdshImageSource": {
"value": "SharedImageGallery"
},
"SharedImageGalleryResourceGroup": {
"value": "wvd-p-weu-sharedimagegallery-rg"
},
"SharedImageGalleryName": {
"value": "WVD_SharedImageGallery"
},
"SharedImageGalleryDefinitionName": {
"value": "WVD-HostPool1-GoldenImage"
},
"SharedImageGalleryVersionName": {
"value": "latest"
},
"hostPoolName": {
"value": "Hostpool1"
},
"rdshNamePrefix": {
"value": "demoVM"
},
"rdshNumberOfInstances": {
"value": 2
},
"rdshVmSize": {
"value": "Standard_D2s_v3"
},
"rdshVMDiskType": {
"value": "Premium_LRS"
},
"domainToJoin": {
"value": "roeleverink.nl"
},
"existingDomainUPN": {
"value": "sa-domainjoin@roeleverink.nl"
},
"existingDomainPassword": {
"reference": {
"keyVault": {
"id": "/subscriptions/f7e06285-03e5-4c9d-95cd-32d791b2563e/resourcegroups/wvd-p-weu-keyvault-rg/providers/Microsoft.KeyVault/vaults/wvd-p-weu-keyvault01"
},
"secretName": "sa-domainjoin"
}
},
"ouPath": {
"value": "OU=Windows Virtual Desktop,OU=Computers,OU=Demo,DC=roeleverink,DC=nl"
},
"existingVnetName": {
"value": "wvd-p-weu-vnet1"
},
"existingSubnetName": {
"value": "wvd-p-weu-vnet1_CLIENTS"
},
"virtualNetworkResourceGroupName": {
"value": "wvd-p-weu-network-rg"
},
"rdBrokerURL": {
"value": "https://rdbroker.wvd.microsoft.com"
},
"existingTenantGroupName": {
"value": "Default Tenant Group"
},
"existingTenantName": {
"value": "roeleverink.nl"
},
"defaultDesktopUsers": {
"value": "r.everink@roeleverink.nl"
},
"tenantAdminUpnOrApplicationId": {
"value": "514e2dd6-ecd4-417b-ac07-de44565cb818"
},
"tenantAdminPassword": {
"reference": {
"keyVault": {
"id": "/subscriptions/f7e06285-03e5-4c9d-95cd-32d791b2563e/resourcegroups/wvd-p-weu-keyvault-rg/providers/Microsoft.KeyVault/vaults/wvd-p-weu-keyvault01"
},
"secretName": "WVD-SP"
}
},
"isServicePrincipal": {
"value": true
},
"aadTenantId": {
"value": "214da8f2-c2d8-4f61-8e13-8dba0a4edaa2"
}
}
}
@@ -14,13 +14,38 @@
"description": "The storage account containing the custom VHD."
}
},
"SharedImageGalleryResourceGroup": {
"type": "string",
"metadata": {
"description": "ResourceGroup name of the Shared Image Gallery"
}
},
"SharedImageGalleryName": {
"type": "string",
"metadata": {
"description": "Name of the Shared Image Gallery."
}
},
"SharedImageGalleryDefinitionName": {
"type": "string",
"metadata": {
"description": "Name of the Image Definition."
}
},
"SharedImageGalleryVersionName": {
"type": "string",
"metadata": {
"description": "Name of the Image Version - should follow <MajorVersion>.<MinorVersion>.<Patch>."
}
},
"rdshGalleryImageSKU": {
"type": "string",
"allowedValues": [
"Windows-10-Enterprise-multi-session-with-Office-365-ProPlus",
"Windows-10-Enterprise-multi-session",
"Windows-10-Enterprise-1903",
"2016-Datacenter"
"2016-Datacenter",
"2019-Datacenter"
],
"metadata": {
"description": "Gallery image SKU."
@@ -139,6 +164,11 @@
"galleryPublisher": "MicrosoftwindowsServer",
"galleryOffer": "WindowsServer",
"gallerySku": "2016-Datacenter"
},
"2019-Datacenter": {
"galleryPublisher": "MicrosoftwindowsServer",
"galleryOffer": "WindowsServer",
"gallerySku": "2019-Datacenter"
}
},
"storageAccountType": "[parameters('rdshVMDiskType')]",
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.