From 041412bb7d35311d12ac00eb5ef6e1dc23a897d3 Mon Sep 17 00:00:00 2001 From: Dany Contreras <78437433+danycontre@users.noreply.github.com> Date: Tue, 19 Sep 2023 10:09:29 -0500 Subject: [PATCH] updates --- .../virtualMachines/deploy.bicep | 10 +++ workload/arm/deploy-baseline.json | 70 +++++++++++++++++-- 2 files changed, 75 insertions(+), 5 deletions(-) diff --git a/carml/1.3.0/Microsoft.Compute/virtualMachines/deploy.bicep b/carml/1.3.0/Microsoft.Compute/virtualMachines/deploy.bicep index e9fffa0d7..fd2e77b77 100644 --- a/carml/1.3.0/Microsoft.Compute/virtualMachines/deploy.bicep +++ b/carml/1.3.0/Microsoft.Compute/virtualMachines/deploy.bicep @@ -525,6 +525,7 @@ module vm_aadJoinExtension 'extensions/deploy.bicep' = if (extensionAadJoinConfi params: { virtualMachineName: vm.name name: 'AADLogin' + location: location publisher: 'Microsoft.Azure.ActiveDirectory' type: osType == 'Windows' ? 'AADLoginForWindows' : 'AADSSHLoginforLinux' typeHandlerVersion: contains(extensionAadJoinConfig, 'typeHandlerVersion') ? extensionAadJoinConfig.typeHandlerVersion : '1.0' @@ -539,6 +540,7 @@ module vm_domainJoinExtension 'extensions/deploy.bicep' = if (extensionDomainJoi params: { virtualMachineName: vm.name name: 'DomainJoin' + location: location publisher: 'Microsoft.Compute' type: 'JsonADDomainExtension' typeHandlerVersion: contains(extensionDomainJoinConfig, 'typeHandlerVersion') ? extensionDomainJoinConfig.typeHandlerVersion : '1.3' @@ -557,6 +559,7 @@ module vm_microsoftAntiMalwareExtension 'extensions/deploy.bicep' = if (extensio params: { virtualMachineName: vm.name name: 'MicrosoftAntiMalware' + location: location publisher: 'Microsoft.Azure.Security' type: 'IaaSAntimalware' typeHandlerVersion: contains(extensionAntiMalwareConfig, 'typeHandlerVersion') ? extensionAntiMalwareConfig.typeHandlerVersion : '1.3' @@ -577,6 +580,7 @@ module vm_microsoftMonitoringAgentExtension 'extensions/deploy.bicep' = if (exte params: { virtualMachineName: vm.name name: 'MicrosoftMonitoringAgent' + location: location publisher: 'Microsoft.EnterpriseCloud.Monitoring' type: osType == 'Windows' ? 'MicrosoftMonitoringAgent' : 'OmsAgentForLinux' typeHandlerVersion: contains(extensionMonitoringAgentConfig, 'typeHandlerVersion') ? extensionMonitoringAgentConfig.typeHandlerVersion : (osType == 'Windows' ? '1.0' : '1.7') @@ -597,6 +601,7 @@ module vm_dependencyAgentExtension 'extensions/deploy.bicep' = if (extensionDepe params: { virtualMachineName: vm.name name: 'DependencyAgent' + location: location publisher: 'Microsoft.Azure.Monitoring.DependencyAgent' type: osType == 'Windows' ? 'DependencyAgentWindows' : 'DependencyAgentLinux' typeHandlerVersion: contains(extensionDependencyAgentConfig, 'typeHandlerVersion') ? extensionDependencyAgentConfig.typeHandlerVersion : '9.5' @@ -611,6 +616,7 @@ module vm_networkWatcherAgentExtension 'extensions/deploy.bicep' = if (extension params: { virtualMachineName: vm.name name: 'NetworkWatcherAgent' + location: location publisher: 'Microsoft.Azure.NetworkWatcher' type: osType == 'Windows' ? 'NetworkWatcherAgentWindows' : 'NetworkWatcherAgentLinux' typeHandlerVersion: contains(extensionNetworkWatcherAgentConfig, 'typeHandlerVersion') ? extensionNetworkWatcherAgentConfig.typeHandlerVersion : '1.4' @@ -625,6 +631,7 @@ module vm_desiredStateConfigurationExtension 'extensions/deploy.bicep' = if (ext params: { virtualMachineName: vm.name name: 'DesiredStateConfiguration' + location: location publisher: 'Microsoft.Powershell' type: 'DSC' typeHandlerVersion: contains(extensionDSCConfig, 'typeHandlerVersion') ? extensionDSCConfig.typeHandlerVersion : '2.77' @@ -641,6 +648,7 @@ module vm_customScriptExtension 'extensions/deploy.bicep' = if (extensionCustomS params: { virtualMachineName: vm.name name: 'CustomScriptExtension' + location: location publisher: osType == 'Windows' ? 'Microsoft.Compute' : 'Microsoft.Azure.Extensions' type: osType == 'Windows' ? 'CustomScriptExtension' : 'CustomScript' typeHandlerVersion: contains(extensionCustomScriptConfig, 'typeHandlerVersion') ? extensionCustomScriptConfig.typeHandlerVersion : (osType == 'Windows' ? '1.10' : '2.1') @@ -662,6 +670,7 @@ module vm_azureDiskEncryptionExtension 'extensions/deploy.bicep' = if (extension params: { virtualMachineName: vm.name name: 'AzureDiskEncryption' + location: location publisher: 'Microsoft.Azure.Security' type: osType == 'Windows' ? 'AzureDiskEncryption' : 'AzureDiskEncryptionForLinux' typeHandlerVersion: contains(extensionAzureDiskEncryptionConfig, 'typeHandlerVersion') ? extensionAzureDiskEncryptionConfig.typeHandlerVersion : (osType == 'Windows' ? '2.2' : '1.1') @@ -681,6 +690,7 @@ module vm_backup '../../Microsoft.RecoveryServices/vaults/protectionContainers/p name: '${uniqueString(deployment().name, location)}-VM-Backup' params: { name: 'vm;iaasvmcontainerv2;${resourceGroup().name};${vm.name}' + location: location policyId: az.resourceId('Microsoft.RecoveryServices/vaults/backupPolicies', backupVaultName, backupPolicyName) protectedItemType: 'Microsoft.Compute/virtualMachines' protectionContainerName: 'iaasvmcontainer;iaasvmcontainerv2;${resourceGroup().name};${vm.name}' diff --git a/workload/arm/deploy-baseline.json b/workload/arm/deploy-baseline.json index 9b1c39e2b..30b9526fa 100644 --- 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": "17199024280522508418" + "templateHash": "18069407191382665045" }, "name": "AVD Accelerator - Baseline Deployment", "description": "AVD Accelerator - Deployment Baseline" @@ -29421,7 +29421,7 @@ "_generator": { "name": "bicep", "version": "0.17.1.54307", - "templateHash": "11482310091325103089" + "templateHash": "2907237861517290313" } }, "parameters": { @@ -29702,7 +29702,7 @@ "_generator": { "name": "bicep", "version": "0.17.1.54307", - "templateHash": "7668761013193612810" + "templateHash": "547922033158170612" } }, "parameters": { @@ -31746,6 +31746,9 @@ "name": { "value": "AADLogin" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Azure.ActiveDirectory" }, @@ -31937,6 +31940,9 @@ "name": { "value": "DomainJoin" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Compute" }, @@ -32140,6 +32146,9 @@ "name": { "value": "MicrosoftAntiMalware" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Azure.Security" }, @@ -32338,6 +32347,9 @@ "name": { "value": "MicrosoftMonitoringAgent" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.EnterpriseCloud.Monitoring" }, @@ -32541,6 +32553,9 @@ "name": { "value": "DependencyAgent" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Azure.Monitoring.DependencyAgent" }, @@ -32734,6 +32749,9 @@ "name": { "value": "NetworkWatcherAgent" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Azure.NetworkWatcher" }, @@ -32927,6 +32945,9 @@ "name": { "value": "DesiredStateConfiguration" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Powershell" }, @@ -33124,6 +33145,9 @@ "name": { "value": "CustomScriptExtension" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": "[if(equals(parameters('osType'), 'Windows'), createObject('value', 'Microsoft.Compute'), createObject('value', 'Microsoft.Azure.Extensions'))]", "type": "[if(equals(parameters('osType'), 'Windows'), createObject('value', 'CustomScriptExtension'), createObject('value', 'CustomScript'))]", "typeHandlerVersion": "[if(contains(parameters('extensionCustomScriptConfig'), 'typeHandlerVersion'), createObject('value', parameters('extensionCustomScriptConfig').typeHandlerVersion), if(equals(parameters('osType'), 'Windows'), createObject('value', '1.10'), createObject('value', '2.1')))]", @@ -33330,6 +33354,9 @@ "name": { "value": "AzureDiskEncryption" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Azure.Security" }, @@ -33527,6 +33554,9 @@ "name": { "value": "[format('vm;iaasvmcontainerv2;{0};{1}', resourceGroup().name, parameters('name'))]" }, + "location": { + "value": "[parameters('location')]" + }, "policyId": { "value": "[resourceId('Microsoft.RecoveryServices/vaults/backupPolicies', parameters('backupVaultName'), parameters('backupPolicyName'))]" }, @@ -43205,7 +43235,7 @@ "_generator": { "name": "bicep", "version": "0.17.1.54307", - "templateHash": "12382067254059662962" + "templateHash": "5800190286840239570" } }, "parameters": { @@ -43602,7 +43632,7 @@ "_generator": { "name": "bicep", "version": "0.17.1.54307", - "templateHash": "7668761013193612810" + "templateHash": "547922033158170612" } }, "parameters": { @@ -45646,6 +45676,9 @@ "name": { "value": "AADLogin" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Azure.ActiveDirectory" }, @@ -45837,6 +45870,9 @@ "name": { "value": "DomainJoin" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Compute" }, @@ -46040,6 +46076,9 @@ "name": { "value": "MicrosoftAntiMalware" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Azure.Security" }, @@ -46238,6 +46277,9 @@ "name": { "value": "MicrosoftMonitoringAgent" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.EnterpriseCloud.Monitoring" }, @@ -46441,6 +46483,9 @@ "name": { "value": "DependencyAgent" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Azure.Monitoring.DependencyAgent" }, @@ -46634,6 +46679,9 @@ "name": { "value": "NetworkWatcherAgent" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Azure.NetworkWatcher" }, @@ -46827,6 +46875,9 @@ "name": { "value": "DesiredStateConfiguration" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Powershell" }, @@ -47024,6 +47075,9 @@ "name": { "value": "CustomScriptExtension" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": "[if(equals(parameters('osType'), 'Windows'), createObject('value', 'Microsoft.Compute'), createObject('value', 'Microsoft.Azure.Extensions'))]", "type": "[if(equals(parameters('osType'), 'Windows'), createObject('value', 'CustomScriptExtension'), createObject('value', 'CustomScript'))]", "typeHandlerVersion": "[if(contains(parameters('extensionCustomScriptConfig'), 'typeHandlerVersion'), createObject('value', parameters('extensionCustomScriptConfig').typeHandlerVersion), if(equals(parameters('osType'), 'Windows'), createObject('value', '1.10'), createObject('value', '2.1')))]", @@ -47230,6 +47284,9 @@ "name": { "value": "AzureDiskEncryption" }, + "location": { + "value": "[parameters('location')]" + }, "publisher": { "value": "Microsoft.Azure.Security" }, @@ -47427,6 +47484,9 @@ "name": { "value": "[format('vm;iaasvmcontainerv2;{0};{1}', resourceGroup().name, parameters('name'))]" }, + "location": { + "value": "[parameters('location')]" + }, "policyId": { "value": "[resourceId('Microsoft.RecoveryServices/vaults/backupPolicies', parameters('backupVaultName'), parameters('backupPolicyName'))]" },