deploy

hmeiland · Jan 11, 2024 · b6aba4c · b6aba4c
1 parent dcc352c
commit b6aba4c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 43 deletions.
diff --git a/deploy/amlhpc_simple.bicep b/deploy/amlhpc_simple.bicep
@@ -1,30 +1,7 @@
 @description('Specifies the name of the deployment.')
 param name string
 
-//@description('Specifies the location of the Azure Machine Learning workspace and dependent resources.')
-//@allowed([
-//  'australiaeast'
-//  'brazilsouth'
-//  'canadacentral'
-//  'centralus'
-//  'eastasia'
-//  'eastus'
-//  'eastus2'
-//  'francecentral'
-//  'japaneast'
-//  'koreacentral'
-//  'northcentralus'
-//  'northeurope'
-//  'southeastasia'
-//  'southcentralus'
-//  'uksouth'
-//  'westcentralus'
-//  'westus'
-//  'westus2'
-//  'westeurope'
-//  'usgovvirginia'
-//])
-param location string = resourceGroup().location
+var location = resourceGroup().location
 
 var resourcePostfix = '${uniqueString(subscription().subscriptionId, resourceGroup().name)}y'
 
@@ -228,9 +205,5 @@ resource ml_cust_env 'Microsoft.MachineLearningServices/workspaces/environments/
     osType: 'Linux'
     image: 'docker.io/hmeiland/amlhpc-ubuntu2004'
     autoRebuild: 'OnBaseImageUpdate'
-    //build: {
-      //contextUri: 'https://github.com/hmeiland/amlhpc.git#main'
-      //dockerfilePath: 'environments/amlslurm-ubuntu2004/Dockerfile'
-    //}
   }  
 }  
diff --git a/deploy/amlhpc_simple.json b/deploy/amlhpc_simple.json
@@ -5,7 +5,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.24.24.22086",
-      "templateHash": "14919288491625898786"
+      "templateHash": "3929046764176533978"
     }
   },
   "parameters": {
@@ -14,13 +14,10 @@
       "metadata": {
         "description": "Specifies the name of the deployment."
       }
-    },
-    "location": {
-      "type": "string",
-      "defaultValue": "[resourceGroup().location]"
     }
   },
   "variables": {
+    "location": "[resourceGroup().location]",
     "resourcePostfix": "[format('{0}y', uniqueString(subscription().subscriptionId, resourceGroup().name))]",
     "tenantId": "[subscription().tenantId]",
     "storageAccountName": "[format('st{0}', parameters('name'))]",
@@ -40,7 +37,7 @@
       "type": "Microsoft.Storage/storageAccounts",
       "apiVersion": "2022-05-01",
       "name": "[format('{0}{1}', variables('storageAccountName'), variables('resourcePostfix'))]",
-      "location": "[parameters('location')]",
+      "location": "[variables('location')]",
       "sku": {
         "name": "Standard_RAGRS"
       },
@@ -66,7 +63,7 @@
       "type": "Microsoft.KeyVault/vaults",
       "apiVersion": "2022-07-01",
       "name": "[format('{0}-{1}', variables('keyVaultName'), variables('resourcePostfix'))]",
-      "location": "[parameters('location')]",
+      "location": "[variables('location')]",
       "properties": {
         "tenantId": "[variables('tenantId')]",
         "sku": {
@@ -81,7 +78,7 @@
       "type": "Microsoft.Insights/components",
       "apiVersion": "2020-02-02",
       "name": "[variables('applicationInsightsName')]",
-      "location": "[parameters('location')]",
+      "location": "[variables('location')]",
       "kind": "web",
       "properties": {
         "Application_Type": "web"
@@ -94,7 +91,7 @@
       "sku": {
         "name": "Standard"
       },
-      "location": "[parameters('location')]",
+      "location": "[variables('location')]",
       "properties": {
         "adminUserEnabled": false
       }
@@ -106,7 +103,7 @@
       "identity": {
         "type": "SystemAssigned"
       },
-      "location": "[parameters('location')]",
+      "location": "[variables('location')]",
       "properties": {
         "friendlyName": "[variables('workspaceName')]",
         "storageAccount": "[variables('storageAccountId')]",
@@ -125,7 +122,7 @@
       "type": "Microsoft.Network/virtualNetworks",
       "apiVersion": "2021-05-01",
       "name": "[variables('virtualNetworkName')]",
-      "location": "[parameters('location')]",
+      "location": "[variables('location')]",
       "properties": {
         "addressSpace": {
           "addressPrefixes": [
@@ -160,13 +157,13 @@
       "type": "Microsoft.MachineLearningServices/workspaces/computes",
       "apiVersion": "2023-06-01-preview",
       "name": "[format('{0}/{1}', format('{0}-{1}', variables('workspaceName'), variables('resourcePostfix')), format('login-{0}', variables('resourcePostfix')))]",
-      "location": "[parameters('location')]",
+      "location": "[variables('location')]",
       "identity": {
         "type": "SystemAssigned"
       },
       "properties": {
         "computeType": "ComputeInstance",
-        "computeLocation": "[parameters('location')]",
+        "computeLocation": "[variables('location')]",
         "description": "Login vm",
         "disableLocalAuth": true,
         "properties": {
@@ -202,13 +199,13 @@
       "type": "Microsoft.MachineLearningServices/workspaces/computes",
       "apiVersion": "2023-06-01-preview",
       "name": "[format('{0}/{1}', format('{0}-{1}', variables('workspaceName'), variables('resourcePostfix')), 'f2s')]",
-      "location": "[parameters('location')]",
+      "location": "[variables('location')]",
       "identity": {
         "type": "SystemAssigned"
       },
       "properties": {
         "computeType": "AmlCompute",
-        "computeLocation": "[parameters('location')]",
+        "computeLocation": "[variables('location')]",
         "disableLocalAuth": true,
         "properties": {
           "vmPriority": "Dedicated",