feat: Update AI service location references in configuration files

Author: Pavan-Microsoft

content-gen/azure.yaml

@@ -66,7 +66,7 @@ hooks:
         Write-Host "AI Search Index: " -NoNewline
         Write-Host "$env:AZURE_AI_SEARCH_PRODUCTS_INDEX" -ForegroundColor Cyan
         Write-Host "AI Service Location: " -NoNewline
-        Write-Host "$env:AI_SERVICE_LOCATION" -ForegroundColor Cyan
+        Write-Host "$env:AZURE_ENV_OPENAI_LOCATION" -ForegroundColor Cyan
         Write-Host "Container Instance: " -NoNewline
         Write-Host "$env:CONTAINER_INSTANCE_NAME" -ForegroundColor Cyan     
         
@@ -112,7 +112,7 @@ hooks:
         echo "Storage Account: $AZURE_BLOB_ACCOUNT_NAME"
         echo "AI Search Service: $AI_SEARCH_SERVICE_NAME"
         echo "AI Search Index: $AZURE_AI_SEARCH_PRODUCTS_INDEX"
-        echo "AI Service Location: $AI_SERVICE_LOCATION"
+        echo "AI Service Location: $AZURE_ENV_OPENAI_LOCATION"
         echo "Container Instance: $CONTAINER_INSTANCE_NAME"
         
         echo ""

content-gen/infra/main.bicep

@@ -190,15 +190,6 @@ var aiServiceRegionFallback = {
   westus3: 'westus3'
 }
 
-// Determine effective AI service location:
-// 1. If explicitly set via parameter, use that (user override)
-// 2. If main location is valid for AI services, use it
-// 3. Otherwise, use the fallback mapping
-var requestedAiLocation = empty(azureAiServiceLocation) ? solutionLocation : azureAiServiceLocation
-var aiServiceLocation = contains(validAiServiceRegions, requestedAiLocation) 
-  ? requestedAiLocation 
-  : (aiServiceRegionFallback[?solutionLocation] ?? 'eastus2')
-
 // acrName is required - points to existing ACR with pre-built images
 var acrResourceName = acrName
 var solutionSuffix = toLower(trim(replace(
@@ -1014,7 +1005,7 @@ output AZURE_AI_AGENT_API_VERSION string = azureAiAgentApiVersion
 output AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING string = (enableMonitoring && !useExistingLogAnalytics) ? applicationInsights!.outputs.connectionString : ''
 
 @description('Contains the location used for AI Services deployment')
-output AI_SERVICE_LOCATION string = azureAiServiceLocation
+output AZURE_ENV_OPENAI_LOCATION string = azureAiServiceLocation
 
 @description('Contains Container Instance Name')
 output CONTAINER_INSTANCE_NAME string = containerInstance.outputs.name

content-gen/infra/main.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.40.2.10011",
-      "templateHash": "16442623120600133305"
+      "templateHash": "9008126217899627179"
     },
     "name": "Intelligent Content Generation Accelerator",
     "description": "Solution Accelerator for multimodal marketing content generation using Microsoft Agent Framework.\n"
@@ -289,8 +289,6 @@
       "westus2": "westus",
       "westus3": "westus3"
     },
-    "requestedAiLocation": "[if(empty(parameters('azureAiServiceLocation')), variables('solutionLocation'), parameters('azureAiServiceLocation'))]",
-    "aiServiceLocation": "[if(contains(variables('validAiServiceRegions'), variables('requestedAiLocation')), variables('requestedAiLocation'), coalesce(tryGet(variables('aiServiceRegionFallback'), variables('solutionLocation')), 'eastus2'))]",
     "acrResourceName": "[parameters('acrName')]",
     "solutionSuffix": "[toLower(trim(replace(replace(replace(replace(replace(replace(format('{0}{1}', parameters('solutionName'), parameters('solutionUniqueText')), '-', ''), '_', ''), '.', ''), '/', ''), ' ', ''), '*', '')))]",
     "cosmosDbZoneRedundantHaRegionPairs": {
@@ -14079,8 +14077,8 @@
       },
       "dependsOn": [
         "aiFoundryAiServices",
-        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
+        "[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
         "virtualNetwork"
       ]
     },
@@ -33809,7 +33807,7 @@
       },
       "value": "[if(and(parameters('enableMonitoring'), not(variables('useExistingLogAnalytics'))), reference('applicationInsights').outputs.connectionString.value, '')]"
     },
-    "AI_SERVICE_LOCATION": {
+    "AZURE_ENV_OPENAI_LOCATION": {
       "type": "string",
       "metadata": {
         "description": "Contains the location used for AI Services deployment"