updates

Azure · Oct 10, 2023 · 73a8e5f · 73a8e5f
1 parent b0d3a7a
commit 73a8e5f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 17 deletions.
diff --git a/workload/arm/deploy-baseline.json b/workload/arm/deploy-baseline.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.17.1.54307",
-      "templateHash": "18197702742347957183"
+      "templateHash": "2675032123942285838"
     },
     "name": "AVD Accelerator - Baseline Deployment",
     "description": "AVD Accelerator - Deployment Baseline"
@@ -1264,7 +1264,6 @@
     "varFslogixScriptUri": "[if(equals(parameters('avdIdentityServiceProvider'), 'AAD'), format('{0}scripts/Set-FSLogixRegKeysAAD.ps1', variables('varBaseScriptUri')), format('{0}scripts/Set-FSLogixRegKeys.ps1', variables('varBaseScriptUri')))]",
     "varAvdAgentsScriptUri": "[format('{0}scripts/Set-AvdAgents.ps1', variables('varBaseScriptUri'))]",
     "varFsLogixScript": "[if(equals(parameters('avdIdentityServiceProvider'), 'AAD'), './Set-FSLogixRegKeysAad.ps1', './Set-FSLogixRegKeys.ps1')]",
-    "varAvdAgentPackageLocation": "[format('https://wvdportalstorageblob.blob.{0}/galleryartifacts/Configuration_09-08-2022.zip', environment().suffixes.storage)]",
     "varDiskEncryptionKeyExpirationInEpoch": "[dateTimeToEpoch(dateTimeAdd(parameters('time'), format('P{0}D', string(parameters('diskEncryptionKeyExpirationInDays')))))]",
     "varCreateStorageDeployment": "[if(or(parameters('createAvdFslogixDeployment'), equals(parameters('createMsixDeployment'), true())), true(), false())]",
     "varFslogixStorageSku": "[if(parameters('zoneRedundantStorage'), format('{0}_ZRS', parameters('fslogixStoragePerformance')), format('{0}_LRS', parameters('fslogixStoragePerformance')))]",
@@ -40940,9 +40939,6 @@
         "mode": "Incremental",
         "parameters": {
           "diskEncryptionSetResourceId": "[if(parameters('diskZeroTrust'), createObject('value', reference(subscriptionResourceId(parameters('avdWorkloadSubsId'), 'Microsoft.Resources/deployments', format('Zero-Trust-{0}', parameters('time'))), '2022-09-01').outputs.ztDiskEncryptionSetResourceId.value), createObject('value', ''))]",
-          "avdAgentPackageLocation": {
-            "value": "[variables('varAvdAgentPackageLocation')]"
-          },
           "timeZone": {
             "value": "[variables('varTimeZoneSessionHosts')]"
           },
@@ -41061,7 +41057,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.17.1.54307",
-              "templateHash": "6146784391132807539"
+              "templateHash": "3061266772808801501"
             }
           },
           "parameters": {
@@ -41269,12 +41265,6 @@
                 "description": "AVD Host Pool name."
               }
             },
-            "avdAgentPackageLocation": {
-              "type": "string",
-              "metadata": {
-                "description": "Location for the AVD agent installation package."
-              }
-            },
             "createAvdFslogixDeployment": {
               "type": "bool",
               "metadata": {

diff --git a/workload/bicep/deploy-baseline.bicep b/workload/bicep/deploy-baseline.bicep
@@ -548,7 +548,6 @@ var varBaseScriptUri = 'https://raw.githubusercontent.com/Azure/avdaccelerator/m
 var varFslogixScriptUri = (avdIdentityServiceProvider == 'AAD') ? '${varBaseScriptUri}scripts/Set-FSLogixRegKeysAAD.ps1' : '${varBaseScriptUri}scripts/Set-FSLogixRegKeys.ps1'
 var varAvdAgentsScriptUri = '${varBaseScriptUri}scripts/Set-AvdAgents.ps1'
 var varFsLogixScript = (avdIdentityServiceProvider == 'AAD') ? './Set-FSLogixRegKeysAad.ps1' : './Set-FSLogixRegKeys.ps1'
-var varAvdAgentPackageLocation = 'https://wvdportalstorageblob.blob.${environment().suffixes.storage}/galleryartifacts/Configuration_09-08-2022.zip'
 var varDiskEncryptionKeyExpirationInEpoch = dateTimeToEpoch(dateTimeAdd(time, 'P${string(diskEncryptionKeyExpirationInDays)}D'))
 var varCreateStorageDeployment = (createAvdFslogixDeployment || createMsixDeployment == true) ? true : false
 var varFslogixStorageSku = zoneRedundantStorage ? '${fslogixStoragePerformance}_ZRS' : '${fslogixStoragePerformance}_LRS'
@@ -1266,7 +1265,6 @@ module sessionHosts './modules/avdSessionHosts/deploy.bicep' = [for i in range(1
     name: 'SH-Batch-${i - 1}-${time}'
     params: {
         diskEncryptionSetResourceId: diskZeroTrust ? zeroTrust.outputs.ztDiskEncryptionSetResourceId : ''
-        avdAgentPackageLocation: varAvdAgentPackageLocation
         timeZone: varTimeZoneSessionHosts
         asgResourceId: (avdDeploySessionHosts || createAvdFslogixDeployment || createMsixDeployment) ? '${networking.outputs.applicationSecurityGroupResourceId}' : ''
         identityServiceProvider: avdIdentityServiceProvider

diff --git a/workload/bicep/modules/avdSessionHosts/deploy.bicep b/workload/bicep/modules/avdSessionHosts/deploy.bicep
@@ -106,9 +106,6 @@ param asgResourceId string
 @sys.description('AVD Host Pool name.')
 param hostPoolName string
 
-@sys.description('Location for the AVD agent installation package.')
-param avdAgentPackageLocation string
-
 @sys.description('Deploy Fslogix setup.')
 param createAvdFslogixDeployment bool