Skip to content

fix: fix parameters in deployment templates to match bicep file #453

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
Harsh-Microsoft wants to merge 1 commit into
base: dev
Choose a base branch
from
+50 −38
Open

fix: fix parameters in deployment templates to match bicep file #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
31 changes: 20 additions & 11 deletions docs/CustomizingAzdParameters.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,27 @@ By default this template will use the environment name as the prefix to prevent
| Name | Type | Example Value | Purpose |
| -------------------------------------- | ------- | --------------------------- | ------------------------------------------------------------------------------------- |
| `AZURE_ENV_NAME` | string | `cps` | Sets the environment name prefix for all Azure resources. |
| `AZURE_ENV_SECONDARY_LOCATION` | string | `eastus2` | Specifies a secondary Azure region. |
| `AZURE_ENV_CU_LOCATION` | string | `WestUS` | Sets the location for the Azure Content Understanding service. |
| `AZURE_LOCATION` | string | `eastus2` | Sets the primary Azure region for resource deployment (allowed values: `australiaeast`, `centralus`, `eastasia`, `eastus2`, `japaneast`, `northeurope`, `southeastasia`, `uksouth`). |
| `AZURE_ENV_AI_DEPLOYMENTS_LOCATION` | string | `eastus2` | Sets the location for the Azure AI Services deployment (allowed values: `australiaeast`, `eastus`, `eastus2`, `francecentral`, `japaneast`, `swedencentral`, `uksouth`, `westus`, `westus3`). |
| `AZURE_ENV_CU_LOCATION` | string | `WestUS` | Sets the location for the Azure Content Understanding service (allowed values: `WestUS`, `SwedenCentral`, `AustraliaEast`). |
| `AZURE_ENV_MODEL_DEPLOYMENT_TYPE` | string | `GlobalStandard` | Defines the model deployment type (allowed values: `Standard`, `GlobalStandard`). |
| `AZURE_ENV_MODEL_NAME` | string | `gpt-4o` | Specifies the GPT model name (allowed values: `gpt-4o`).
| `AZURE_ENV_MODEL_VERSION` | string | `2024-08-06` | Specifies the GPT model version (allowed values: `2024-08-06`). |
| `AZURE_ENV_MODEL_CAPACITY` | integer | `30` | Sets the model capacity (choose based on your subscription's available GPT capacity). |
| `AZURE_ENV_IMAGETAG` | boolean | `latest` | Set the Image tag Like (allowed values: latest, dev, hotfix) |
| `AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT` | string | `cpscontainerreg.azurecr.io` | Sets the Azure Container Registry name (allowed value: `cpscontainerreg.azurecr.io`) | |
| `AZURE_ENV_CONTAINER_IMAGE_TAG` | string | `latest` | Sets the container image tag (e.g., `latest`, `dev`, `hotfix`). |
| `AZURE_LOCATION` | string | `eastus` | Sets the primary Azure region for resource deployment. |
| `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID` | string | Guide to get your [Existing Workspace ID](/docs/re-use-log-analytics.md) | Reuses an existing Log Analytics Workspace instead of provisioning a new one. |
| `AZURE_EXISTING_AI_PROJECT_RESOURCE_ID` | string | `<Existing AI Project resource Id>` | Reuses an existing AIFoundry and AIFoundryProject instead of creating a new one. |
| `AZURE_ENV_MODEL_NAME` | string | `gpt-4o` | Specifies the GPT model name (allowed values: `gpt-4o`). |
| `AZURE_ENV_MODEL_VERSION` | string | `2024-08-06` | Specifies the GPT model version (allowed values: `2024-08-06`). |
| `AZURE_ENV_MODEL_CAPACITY` | integer | `30` | Sets the model capacity (choose based on your subscription's available GPT capacity). |
| `AZURE_ENV_CONTAINER_REGISTRY_ENDPOINT` | string | `cpscontainerreg.azurecr.io` | Sets the Azure Container Registry endpoint (allowed value: `cpscontainerreg.azurecr.io`). |
| `AZURE_ENV_CONTAINER_IMAGE_TAG` | string | `latest` | Sets the container image tag (e.g., `latest`, `dev`, `hotfix`). |
| `AZURE_ENV_LOG_ANALYTICS_WORKSPACE_ID` | string | Guide to get your [Existing Workspace ID](/docs/re-use-log-analytics.md) | Reuses an existing Log Analytics Workspace instead of provisioning a new one. |
| `AZURE_ENV_FOUNDRY_PROJECT_ID` | string | `<Existing AI Project resource Id>` | Reuses an existing AI Foundry and AI Foundry Project instead of creating a new one. |

### WAF Deployment Parameters

The following parameters are only used when deploying with WAF-aligned configuration (`main.waf.parameters.json`):

| Name | Type | Example Value | Purpose |
| -------------------------------------- | ------- | --------------------------- | ------------------------------------------------------------------------------------- |
| `AZURE_ENV_VM_SIZE` | string | `Standard_DS2_v2` | Sets the size of the Jumpbox Virtual Machine. |
| `AZURE_ENV_VM_ADMIN_USERNAME` | string | `JumpboxAdminUser` | Sets the admin username for the Jumpbox Virtual Machine. |
| `AZURE_ENV_VM_ADMIN_PASSWORD` | string | *(secure)* | Sets the admin password for the Jumpbox Virtual Machine. |

## How to Set a Parameter

Expand Down
50 changes: 25 additions & 25 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": "4821257159531769907"
"version": "0.41.2.15936",
"templateHash": "3702628187124943368"
},
"name": "Content Processing Solution Accelerator",
"description": "Bicep template to deploy the Content Processing Solution Accelerator with AVM compliance."
Expand Down Expand Up @@ -350,8 +350,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "637986880127430337"
"version": "0.41.2.15936",
"templateHash": "4055670269816744382"
}
},
"definitions": {
Expand Down Expand Up @@ -19227,8 +19227,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "3741201002953968110"
"version": "0.41.2.15936",
"templateHash": "6350282028214740152"
}
},
"parameters": {
Expand Down Expand Up @@ -23233,8 +23233,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "10844547551448610415"
"version": "0.41.2.15936",
"templateHash": "13929816981891754138"
}
},
"parameters": {
Expand Down Expand Up @@ -23825,8 +23825,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "7885429842089695683"
"version": "0.41.2.15936",
"templateHash": "17694195801715707119"
},
"name": "Container Registry Module"
},
Expand Down Expand Up @@ -35290,8 +35290,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "7557665774149769517"
"version": "0.41.2.15936",
"templateHash": "11676375352983709807"
},
"name": "Cognitive Services",
"description": "This module deploys a Cognitive Service."
Expand Down Expand Up @@ -36540,8 +36540,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "6588447351857766372"
"version": "0.41.2.15936",
"templateHash": "8716336912243881623"
}
},
"definitions": {
Expand Down Expand Up @@ -38349,8 +38349,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "14939823368517410024"
"version": "0.41.2.15936",
"templateHash": "10989408486030617267"
}
},
"definitions": {
Expand Down Expand Up @@ -38503,8 +38503,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "13151306134286549002"
"version": "0.41.2.15936",
"templateHash": "7933643033523871028"
}
},
"definitions": {
Expand Down Expand Up @@ -38721,8 +38721,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "6588447351857766372"
"version": "0.41.2.15936",
"templateHash": "8716336912243881623"
}
},
"definitions": {
Expand Down Expand Up @@ -40530,8 +40530,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "14939823368517410024"
"version": "0.41.2.15936",
"templateHash": "10989408486030617267"
}
},
"definitions": {
Expand Down Expand Up @@ -40684,8 +40684,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "13151306134286549002"
"version": "0.41.2.15936",
"templateHash": "7933643033523871028"
}
},
"definitions": {
Expand Down Expand Up @@ -40925,9 +40925,9 @@
"dependsOn": [
"avmContainerApp",
"avmManagedIdentity",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').aiServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').contentUnderstanding)]",
"logAnalyticsWorkspace",
"virtualNetwork"
Expand Down
7 changes: 5 additions & 2 deletions infra/main.waf.parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,13 @@
"enableScalability": {
"value": true
},
"virtualMachineAdminUsername": {
"vmSize": {
"value": "${AZURE_ENV_VM_SIZE}"
},
"vmAdminUsername": {
"value": "${AZURE_ENV_VM_ADMIN_USERNAME}"
},
"virtualMachineAdminPassword": {
"vmAdminPassword": {
"value": "${AZURE_ENV_VM_ADMIN_PASSWORD}"
},
"publicContainerImageEndpoint": {
Expand Down
Loading