Skip to content

fix: Update parameters for AI services and remove secondary location references #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Prachig-Microsoft wants to merge 2 commits into
base: dev
Choose a base branch
from
+14 −69
Open

fix: Update parameters for AI services and remove secondary location references #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a74666
Update parameters for AI services and remove secondary location refer…
Prachig-Microsoft Mar 17, 2026
2b56470
Remove aiDeploymentLocation parameter from workflows and documentation
Prachig-Microsoft Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@ jobs:
--template-file infra/main.bicep \
--parameters solutionName=${{env.SOLUTION_PREFIX}} \
--parameters location=${{ env.AZURE_LOCATION }} \
--parameters aiDeploymentLocation=${{ env.AZURE_LOCATION }} \
--parameters azureAiServiceLocation=${{ env.AZURE_LOCATION }} \
--parameters createdBy="pipeline" \

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/job-deploy-linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ jobs:
# Set additional parameters
azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
azd env set AZURE_AI_SERVICE_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
azd env set AZURE_AI_DEPLOYMENT_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
azd env set AZURE_AI_SERVICE_LOCATION="$AZURE_ENV_OPENAI_LOCATION"
azd env set AZURE_LOCATION="$AZURE_LOCATION"
azd env set AZURE_RESOURCE_GROUP="$RESOURCE_GROUP_NAME"
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/job-deploy-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ jobs:
# Set additional parameters
azd env set AZURE_SUBSCRIPTION_ID="${{ secrets.AZURE_SUBSCRIPTION_ID }}"
azd env set AZURE_AI_SERVICE_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION"
azd env set AZURE_AI_DEPLOYMENT_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION"
azd env set AZURE_AI_SERVICE_LOCATION="$env:AZURE_ENV_OPENAI_LOCATION"
azd env set AZURE_LOCATION="$env:AZURE_LOCATION"
azd env set AZURE_RESOURCE_GROUP="$env:RESOURCE_GROUP_NAME"
Expand Down
5 changes: 3 additions & 2 deletions docs/CustomizingAzdParameters.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ By default this template will use the environment name as the prefix to prevent
| ------------------------------- | ------- | ----------------------- | ------------------------------------------------------------------------------------- |
| `AZURE_ENV_NAME` | string | `conmig` | Sets the environment name prefix for all Azure resources. |
| `AZURE_LOCATION` | string | `westus` | Sets the location/region for all Azure resources. |
| `AZURE_SECONDARY_LOCATION` | string | `eastus2` | Specifies a secondary Azure region. |
| `AZURE_CONTAINER_REGISTRY_HOST` | string | `myregistry.azurecr.io` | Specifies the container registry from which to pull app container images. |
| `AZURE_AI_DEPLOYMENT_LOCATION` | string | `eastus2` | Specifies alternative location for AI model resources. |
| `AZURE_AI_SERVICE_LOCATION` | string | `eastus2` | Specifies the Azure region for AI services (OpenAI/AI Foundry). |
| `AZURE_AI_DEPLOYMENT_TYPE` | string | `GlobalStandard` | Defines the model deployment type (allowed values: `Standard`, `GlobalStandard`). |
| `AZURE_AI_MODEL_NAME` | string | `o3` | Specifies the `o` model name. |
| `AZURE_AI_MODEL_VERSION` | string | `2025-04-16` | Specifies the `o` model version. |
| `AZURE_AI_MODEL_CAPACITY` | integer | `200` | Sets the model capacity (choose based on your subscription's available `o` capacity). |
| `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID` | string | `` | Optional. Resource ID of an existing Log Analytics workspace to use. |
| `AZURE_EXISTING_AI_PROJECT_RESOURCE_ID` | string | `` | Optional. Resource ID of an existing AI Foundry project to use. |
| `AZURE_ENV_VM_ADMIN_USERNAME` | string | `` | The administrator username for the virtual machine. |
| `AZURE_ENV_VM_ADMIN_PASSWORD` | string | `` | The administrator password for the virtual machine. |
| `AZURE_ENV_IMAGETAG` | string | `latest` | Specifies the container image tag to use for deployment. |
Expand Down
17 changes: 1 addition & 16 deletions infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,7 @@ var solutionLocation = empty(location) ? resourceGroup().location : location
@description('Required. Azure region for AI services (OpenAI/AI Foundry). Must be a region that supports o3 model deployment.')
param azureAiServiceLocation string

@allowed([
'australiaeast'
'eastus'
'eastus2'
'francecentral'
'japaneast'
'norwayeast'
'southindia'
'swedencentral'
'uksouth'
'westus'
'westus3'
])
@description('Required. Azure region for AI model deployment. Should match azureAiServiceLocation for optimal performance.')
#disable-next-line no-unused-params
param aiDeploymentLocation string = azureAiServiceLocation


@description('Optional. The host (excluding https://) of an existing container registry. This is the `loginServer` when using Azure Container Registry.')
param containerRegistryHost string = 'containermigrationacr.azurecr.io'
Expand Down
36 changes: 8 additions & 28 deletions infra/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "46164870636097653"
"version": "0.41.2.15936",
"templateHash": "14235802001827059391"
}
},
"parameters": {
Expand Down Expand Up @@ -61,26 +61,6 @@
"description": "Required. Azure region for AI services (OpenAI/AI Foundry). Must be a region that supports o3 model deployment."
}
},
"aiDeploymentLocation": {
"type": "string",
"defaultValue": "[parameters('azureAiServiceLocation')]",
"allowedValues": [
"australiaeast",
"eastus",
"eastus2",
"francecentral",
"japaneast",
"norwayeast",
"southindia",
"swedencentral",
"uksouth",
"westus",
"westus3"
],
"metadata": {
"description": "Required. Azure region for AI model deployment. Should match azureAiServiceLocation for optimal performance."
}
},
"containerRegistryHost": {
"type": "string",
"defaultValue": "containermigrationacr.azurecr.io",
Expand Down Expand Up @@ -4698,8 +4678,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "13184395339364197836"
"version": "0.41.2.15936",
"templateHash": "10681183203421948888"
}
},
"definitions": {
Expand Down Expand Up @@ -30068,8 +30048,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "8742987061721021759"
"version": "0.41.2.15936",
"templateHash": "8365054813170845685"
}
},
"definitions": {
Expand Down Expand Up @@ -52099,9 +52079,9 @@
},
"dependsOn": [
"appIdentity",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
"virtualNetwork"
]
},
Expand Down
11 changes: 1 addition & 10 deletions infra/main.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,12 @@
"location": {
"value": "${AZURE_LOCATION}"
},
"secondaryLocation": {
"value": "${AZURE_SECONDARY_LOCATION}"
},
"containerRegistryHost": {
"value": "${AZURE_CONTAINER_REGISTRY_HOST}"
},
"azureAiServiceLocation": {
"value": "${AZURE_AI_SERVICE_LOCATION}"
},
"aiDeploymentLocation": {
"value": "${AZURE_AI_DEPLOYMENT_LOCATION}"
},
"azureAiServiceLocation": {
"value": "${AZURE_AI_SERVICE_LOCATION}"
},
"aiDeploymentType": {
"value": "${AZURE_AI_DEPLOYMENT_TYPE}"
},
Expand All @@ -41,7 +32,7 @@
"existingLogAnalyticsWorkspaceId": {
"value": "${AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID}"
},
"existingFoundryProjectResourceId":{
"existingFoundryProjectResourceId": {
"value": "${AZURE_EXISTING_AI_PROJECT_RESOURCE_ID}"
},
"vmAdminUsername": {
Expand Down
11 changes: 1 addition & 10 deletions infra/main.waf.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,12 @@
"location": {
"value": "${AZURE_LOCATION}"
},
"secondaryLocation": {
"value": "${AZURE_SECONDARY_LOCATION}"
},
"containerRegistryHost": {
"value": "${AZURE_CONTAINER_REGISTRY_HOST}"
},
"azureAiServiceLocation": {
"value": "${AZURE_AI_SERVICE_LOCATION}"
},
"aiDeploymentLocation": {
"value": "${AZURE_AI_DEPLOYMENT_LOCATION}"
},
"azureAiServiceLocation": {
"value": "${AZURE_AI_SERVICE_LOCATION}"
},
"aiDeploymentType": {
"value": "${AZURE_AI_DEPLOYMENT_TYPE}"
},
Expand Down Expand Up @@ -56,7 +47,7 @@
"existingLogAnalyticsWorkspaceId": {
"value": "${AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID}"
},
"existingFoundryProjectResourceId":{
"existingFoundryProjectResourceId": {
"value": "${AZURE_EXISTING_AI_PROJECT_RESOURCE_ID}"
},
"imageTag": {
Expand Down
Loading