Skip to content

Commit 2b56470

Browse files
Remove aiDeploymentLocation parameter from workflows and documentation
1 parent 5a74666 commit 2b56470

8 files changed

Lines changed: 9 additions & 54 deletions

File tree

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ jobs:
133133
--template-file infra/main.bicep \
134134
--parameters solutionName=${{env.SOLUTION_PREFIX}} \
135135
--parameters location=${{ env.AZURE_LOCATION }} \
136-
--parameters aiDeploymentLocation=${{ env.AZURE_LOCATION }} \
137136
--parameters azureAiServiceLocation=${{ env.AZURE_LOCATION }} \
138137
--parameters createdBy="pipeline" \
139138

.github/workflows/job-deploy-linux.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ jobs:
238238
# Set additional parameters
239239
azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
240240
azd env set AZURE_AI_SERVICE_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
241-
azd env set AZURE_AI_DEPLOYMENT_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
242241
azd env set AZURE_AI_SERVICE_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
243242
azd env set AZURE_LOCATION="$AZURE_LOCATION"
244243
azd env set AZURE_RESOURCE_GROUP="$RESOURCE_GROUP_NAME"

.github/workflows/job-deploy-windows.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ jobs:
239239
# Set additional parameters
240240
azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
241241
azd env set AZURE_AI_SERVICE_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION"
242-
azd env set AZURE_AI_DEPLOYMENT_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION"
243242
azd env set AZURE_AI_SERVICE_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION"
244243
azd env set AZURE_LOCATION="$env:AZURE_LOCATION"
245244
azd env set AZURE_RESOURCE_GROUP="$env:RESOURCE_GROUP_NAME"

docs/CustomizingAzdParameters.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ By default this template will use the environment name as the prefix to prevent
1212
| `AZURE_LOCATION` | string | `westus` | Sets the location/region for all Azure resources. |
1313
| `AZURE_CONTAINER_REGISTRY_HOST` | string | `myregistry.azurecr.io` | Specifies the container registry from which to pull app container images. |
1414
| `AZURE_AI_SERVICE_LOCATION` | string | `eastus2` | Specifies the Azure region for AI services (OpenAI/AI Foundry). |
15-
| `AZURE_AI_DEPLOYMENT_LOCATION` | string | `eastus2` | Specifies alternative location for AI model resources. |
1615
| `AZURE_AI_DEPLOYMENT_TYPE` | string | `GlobalStandard` | Defines the model deployment type (allowed values: `Standard`, `GlobalStandard`). |
1716
| `AZURE_AI_MODEL_NAME` | string | `o3` | Specifies the `o` model name. |
1817
| `AZURE_AI_MODEL_VERSION` | string | `2025-04-16` | Specifies the `o` model version. |

infra/main.bicep

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,7 @@ var solutionLocation = empty(location) ? resourceGroup().location : location
3939
@description('Required. Azure region for AI services (OpenAI/AI Foundry). Must be a region that supports o3 model deployment.')
4040
param azureAiServiceLocation string
4141

42-
@allowed([
43-
'australiaeast'
44-
'eastus'
45-
'eastus2'
46-
'francecentral'
47-
'japaneast'
48-
'norwayeast'
49-
'southindia'
50-
'swedencentral'
51-
'uksouth'
52-
'westus'
53-
'westus3'
54-
])
55-
@description('Required. Azure region for AI model deployment. Should match azureAiServiceLocation for optimal performance.')
56-
#disable-next-line no-unused-params
57-
param aiDeploymentLocation string = azureAiServiceLocation
42+
5843

5944
@description('Optional. The host (excluding https://) of an existing container registry. This is the `loginServer` when using Azure Container Registry.')
6045
param containerRegistryHost string = 'containermigrationacr.azurecr.io'

infra/main.json

Lines changed: 8 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"metadata": {
66
"_generator": {
77
"name": "bicep",
8-
"version": "0.40.2.10011",
9-
"templateHash": "46164870636097653"
8+
"version": "0.41.2.15936",
9+
"templateHash": "14235802001827059391"
1010
}
1111
},
1212
"parameters": {
@@ -61,26 +61,6 @@
6161
"description": "Required. Azure region for AI services (OpenAI/AI Foundry). Must be a region that supports o3 model deployment."
6262
}
6363
},
64-
"aiDeploymentLocation": {
65-
"type": "string",
66-
"defaultValue": "[parameters('azureAiServiceLocation')]",
67-
"allowedValues": [
68-
"australiaeast",
69-
"eastus",
70-
"eastus2",
71-
"francecentral",
72-
"japaneast",
73-
"norwayeast",
74-
"southindia",
75-
"swedencentral",
76-
"uksouth",
77-
"westus",
78-
"westus3"
79-
],
80-
"metadata": {
81-
"description": "Required. Azure region for AI model deployment. Should match azureAiServiceLocation for optimal performance."
82-
}
83-
},
8464
"containerRegistryHost": {
8565
"type": "string",
8666
"defaultValue": "containermigrationacr.azurecr.io",
@@ -4698,8 +4678,8 @@
46984678
"metadata": {
46994679
"_generator": {
47004680
"name": "bicep",
4701-
"version": "0.40.2.10011",
4702-
"templateHash": "13184395339364197836"
4681+
"version": "0.41.2.15936",
4682+
"templateHash": "10681183203421948888"
47034683
}
47044684
},
47054685
"definitions": {
@@ -30068,8 +30048,8 @@
3006830048
"metadata": {
3006930049
"_generator": {
3007030050
"name": "bicep",
30071-
"version": "0.40.2.10011",
30072-
"templateHash": "8742987061721021759"
30051+
"version": "0.41.2.15936",
30052+
"templateHash": "8365054813170845685"
3007330053
}
3007430054
},
3007530055
"definitions": {
@@ -52099,9 +52079,9 @@
5209952079
},
5210052080
"dependsOn": [
5210152081
"appIdentity",
52102-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
52103-
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
5210452082
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
52083+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
52084+
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
5210552085
"virtualNetwork"
5210652086
]
5210752087
},

infra/main.parameters.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
"azureAiServiceLocation": {
1515
"value": "${AZURE_AI_SERVICE_LOCATION}"
1616
},
17-
"aiDeploymentLocation": {
18-
"value": "${AZURE_AI_DEPLOYMENT_LOCATION}"
19-
},
2017
"aiDeploymentType": {
2118
"value": "${AZURE_AI_DEPLOYMENT_TYPE}"
2219
},

infra/main.waf.parameters.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,6 @@
1414
"azureAiServiceLocation": {
1515
"value": "${AZURE_AI_SERVICE_LOCATION}"
1616
},
17-
"aiDeploymentLocation": {
18-
"value": "${AZURE_AI_DEPLOYMENT_LOCATION}"
19-
},
2017
"aiDeploymentType": {
2118
"value": "${AZURE_AI_DEPLOYMENT_TYPE}"
2219
},

0 commit comments

Comments
 (0)