Skip to content

Commit

Permalink
Merge pull request #12 from bennyaustin/mcaps-config
Browse files Browse the repository at this point in the history
Config Updates
  • Loading branch information
bennyaustin authored Aug 23, 2024
2 parents 5e6e441 + b8d0493 commit 67a73d9
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
22 changes: 11 additions & 11 deletions bicep/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ param enable_purview bool =true
param purview_rg_name string = 'rg-datagovernance'

@description('Resource Name of an existing Purview Account. Required if create_purview=true')
param purview_resource_name string = 'ba-purview01-6spfx5oytiivq'
param purview_resource_name string = 'ContosoDG'

@description('Resource Name of an existing Storage Account for Azure Machine Learning')
param aiml_storage_name string = 'bacustmodelstorage01q575'
param aiml_storage_name string = 'baaimlstorage01'

@description('Timestamp that will be appendedto the deployment name')
param deployment_suffix string = utcNow()
Expand All @@ -36,7 +36,7 @@ param deployment_suffix string = utcNow()
// Variables
var keyvault_deployment_name = 'keyvault_deployment_${deployment_suffix}'
var cogsvc_deployment_name = 'cogsvc_deployment_${deployment_suffix}'
var aml_deployment_name = 'aml_deployment_${deployment_suffix}'
// var aml_deployment_name = 'aml_deployment_${deployment_suffix}'

// Create data platform resource group
resource aiml_rg 'Microsoft.Resources/resourceGroups@2022-09-01' = {
Expand Down Expand Up @@ -68,10 +68,10 @@ resource kv_ref 'Microsoft.KeyVault/vaults@2022-07-01' existing = {
scope: aiml_rg
}

//Get Storage reference
resource aiml_storage_ref 'Microsoft.Storage/storageAccounts@2021-04-01' existing = {
name: aiml_storage_name
scope: aiml_rg
// //Get Storage reference
// resource aiml_storage_ref 'Microsoft.Storage/storageAccounts@2021-04-01' existing = {
// name: aiml_storage_name
// scope: aiml_rg
}


Expand All @@ -91,8 +91,8 @@ module cogsvc './modules/cognitive.bicep' = {
name: cogsvc_deployment_name
scope: aiml_rg
params:{
formrecognizer_name: 'ba-formrecognizer01'
custom_model_storage_name: 'bacustmodelstorage01'
formrecognizer_name: 'ba-doci01'
custom_model_storage_name: 'baaimlstorage01'
custom_model_storage_sku: 'Standard_LRS'
location: rglocation
cost_centre_tag: cost_centre_tag
Expand All @@ -101,12 +101,12 @@ module cogsvc './modules/cognitive.bicep' = {
formrecognizer_sku: 'S0'
enable_purview: enable_purview
purview_resource: purview_ref
cogsearch_name: 'ba-cogsearch01'
cogsearch_name: 'ba-aisearch01'
cogsearch_hostingMode: 'default'
cogsearch_partitionCount: 1
cogsearch_replicaCount: 1
cogsearch_sku: 'standard'
azureopenai_name: 'ba-aoai02'
azureopenai_name: 'ba-aoai01'
azureopenai_sku: 'S0'
}
}
Expand Down
2 changes: 1 addition & 1 deletion bicep/modules/cognitive.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ var formrecognizer_uniquename = '${formrecognizer_name}-${suffix}'
var custom_model_storage_uniquename = substring('${custom_model_storage_name}${suffix}',0,24)
var cogsearch_uniquename = '${cogsearch_name}-${suffix}'
var azureopenai_uniquename = '${azureopenai_name}-${suffix}'
var azureopenai_gpt4location = 'canadaeast'
var azureopenai_gpt4location = 'australiaeast'

// Commented out - Since multi-service cognitive service requires to accept terms of responsible AI manually from the Azure portal
// //Multi-service Cognitive
Expand Down
4 changes: 2 additions & 2 deletions bicep/modules/keyvault.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ resource keyvault 'Microsoft.KeyVault/vaults@2022-07-01' ={
// Default Access Policies. Replace the ObjectID's with your user/group id
accessPolicies:[
{ tenantId: subscription().tenantId
objectId: 'c7c5e19c-a8e9-451e-b0a5-7a38a8fce9fe' // Replace this with your user/group ObjectID
objectId: '01e16ca5-e5da-49f3-ac27-a46f1cc68ede' // Replace this with your user/group ObjectID
permissions: {secrets:['list','get','set']}
}
{ tenantId: subscription().tenantId
objectId: '427bc8f2-8bf1-441b-8a24-d43e1f53698c' // Replace this with your user/group ObjectID
objectId: '688ad7c8-d7bb-4f32-884a-05601c9762a2' // Replace this with your user/group ObjectID
permissions: {secrets:['list','get','set']}
}
]
Expand Down

0 comments on commit 67a73d9

Please sign in to comment.