Merge branch 'Azure-Samples:main' into remove-planner

Author: johnoliver

infra/main.bicep

@@ -42,6 +42,7 @@ param openAiResourceGroupName string = ''
   }
 })
 param openAiResourceGroupLocation string
+param customOpenAiResourceGroupLocation string = ''
 
 param openAiSkuName string = 'S0'
 
@@ -163,7 +164,7 @@ module openAi 'core/ai/cognitiveservices.bicep' = if (openAiHost == 'azure') {
   scope: openAiResourceGroup
   params: {
     name: !empty(openAiServiceName) ? openAiServiceName : '${abbrs.cognitiveServicesAccounts}${resourceToken}'
-    location: openAiResourceGroupLocation
+    location: !empty(customOpenAiResourceGroupLocation) ? customOpenAiResourceGroupLocation : openAiResourceGroupLocation
     tags: tags
     sku: {
       name: openAiSkuName

infra/main.parameters.json

@@ -20,7 +20,7 @@
     "openAiResourceGroupName": {
       "value": "${AZURE_OPENAI_RESOURCE_GROUP}"
     },
-    "openAiResourceGroupLocation": {
+    "customOpenAiResourceGroupLocation": {
       "value": "${AZURE_OPENAI_SERVICE_LOCATION}"
     },
     "openAiSkuName": {