Skip to content

Commit 00b4071

Browse files
feat: Update AI deployment location parameter to required and remove deprecated region mappings
1 parent 43a60c1 commit 00b4071

2 files changed

Lines changed: 4 additions & 113 deletions

File tree

content-gen/infra/main.bicep

Lines changed: 1 addition & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ param secondaryLocation string = 'uksouth'
4747
]
4848
}
4949
})
50-
@description('Optional. Location for AI deployments. If not specified, uses the main location.')
50+
@description('Required. Location for AI deployments.')
5151
param azureAiServiceLocation string
5252

5353
@minLength(1)
@@ -133,63 +133,6 @@ param createdBy string = contains(deployer(), 'userPrincipalName')? split(deploy
133133

134134
var solutionLocation = empty(location) ? resourceGroup().location : location
135135

136-
// Regions that support GPT-5.1, GPT-Image-1, and text-embedding models with GlobalStandard SKU
137-
// Update this list as Azure expands model availability
138-
var validAiServiceRegions = [
139-
'australiaeast'
140-
'eastus'
141-
'eastus2'
142-
'francecentral'
143-
'japaneast'
144-
'koreacentral'
145-
'swedencentral'
146-
'switzerlandnorth'
147-
'uaenorth'
148-
'uksouth'
149-
'westus'
150-
'westus3'
151-
]
152-
153-
// Map regions to recommended AI service regions (for when main region lacks model support)
154-
var aiServiceRegionFallback = {
155-
australiaeast: 'australiaeast'
156-
australiasoutheast: 'australiaeast'
157-
brazilsouth: 'eastus2'
158-
canadacentral: 'eastus2'
159-
canadaeast: 'eastus2'
160-
centralindia: 'uksouth'
161-
centralus: 'eastus2'
162-
eastasia: 'japaneast'
163-
eastus: 'eastus'
164-
eastus2: 'eastus2'
165-
francecentral: 'francecentral'
166-
germanywestcentral: 'swedencentral'
167-
japaneast: 'japaneast'
168-
japanwest: 'japaneast'
169-
koreacentral: 'koreacentral'
170-
koreasouth: 'koreacentral'
171-
northcentralus: 'eastus2'
172-
northeurope: 'swedencentral'
173-
norwayeast: 'swedencentral'
174-
polandcentral: 'swedencentral'
175-
qatarcentral: 'uaenorth'
176-
southafricanorth: 'uksouth'
177-
southcentralus: 'eastus2'
178-
southeastasia: 'japaneast'
179-
southindia: 'uksouth'
180-
swedencentral: 'swedencentral'
181-
switzerlandnorth: 'switzerlandnorth'
182-
uaenorth: 'uaenorth'
183-
uksouth: 'uksouth'
184-
ukwest: 'uksouth'
185-
westcentralus: 'westus'
186-
westeurope: 'swedencentral'
187-
westindia: 'uksouth'
188-
westus: 'westus'
189-
westus2: 'westus'
190-
westus3: 'westus3'
191-
}
192-
193136
// acrName is required - points to existing ACR with pre-built images
194137
var acrResourceName = acrName
195138
var solutionSuffix = toLower(trim(replace(

content-gen/infra/main.json

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"_generator": {
77
"name": "bicep",
88
"version": "0.40.2.10011",
9-
"templateHash": "9008126217899627179"
9+
"templateHash": "13692784047172844036"
1010
},
1111
"name": "Intelligent Content Generation Accelerator",
1212
"description": "Solution Accelerator for multimodal marketing content generation using Microsoft Agent Framework.\n"
@@ -70,7 +70,7 @@
7070
"OpenAI.GlobalStandard.gpt-image-1,1"
7171
]
7272
},
73-
"description": "Optional. Location for AI deployments. If not specified, uses the main location."
73+
"description": "Required. Location for AI deployments."
7474
}
7575
},
7676
"gptModelDeploymentType": {
@@ -237,58 +237,6 @@
237237
},
238238
"variables": {
239239
"solutionLocation": "[if(empty(parameters('location')), resourceGroup().location, parameters('location'))]",
240-
"validAiServiceRegions": [
241-
"australiaeast",
242-
"eastus",
243-
"eastus2",
244-
"francecentral",
245-
"japaneast",
246-
"koreacentral",
247-
"swedencentral",
248-
"switzerlandnorth",
249-
"uaenorth",
250-
"uksouth",
251-
"westus",
252-
"westus3"
253-
],
254-
"aiServiceRegionFallback": {
255-
"australiaeast": "australiaeast",
256-
"australiasoutheast": "australiaeast",
257-
"brazilsouth": "eastus2",
258-
"canadacentral": "eastus2",
259-
"canadaeast": "eastus2",
260-
"centralindia": "uksouth",
261-
"centralus": "eastus2",
262-
"eastasia": "japaneast",
263-
"eastus": "eastus",
264-
"eastus2": "eastus2",
265-
"francecentral": "francecentral",
266-
"germanywestcentral": "swedencentral",
267-
"japaneast": "japaneast",
268-
"japanwest": "japaneast",
269-
"koreacentral": "koreacentral",
270-
"koreasouth": "koreacentral",
271-
"northcentralus": "eastus2",
272-
"northeurope": "swedencentral",
273-
"norwayeast": "swedencentral",
274-
"polandcentral": "swedencentral",
275-
"qatarcentral": "uaenorth",
276-
"southafricanorth": "uksouth",
277-
"southcentralus": "eastus2",
278-
"southeastasia": "japaneast",
279-
"southindia": "uksouth",
280-
"swedencentral": "swedencentral",
281-
"switzerlandnorth": "switzerlandnorth",
282-
"uaenorth": "uaenorth",
283-
"uksouth": "uksouth",
284-
"ukwest": "uksouth",
285-
"westcentralus": "westus",
286-
"westeurope": "swedencentral",
287-
"westindia": "uksouth",
288-
"westus": "westus",
289-
"westus2": "westus",
290-
"westus3": "westus3"
291-
},
292240
"acrResourceName": "[parameters('acrName')]",
293241
"solutionSuffix": "[toLower(trim(replace(replace(replace(replace(replace(replace(format('{0}{1}', parameters('solutionName'), parameters('solutionUniqueText')), '-', ''), '_', ''), '.', ''), '/', ''), ' ', ''), '*', '')))]",
294242
"cosmosDbZoneRedundantHaRegionPairs": {
@@ -14077,8 +14025,8 @@
1407714025
},
1407814026
"dependsOn": [
1407914027
"aiFoundryAiServices",
14080-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
1408114028
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
14029+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
1408214030
"virtualNetwork"
1408314031
]
1408414032
},

0 commit comments

Comments
 (0)