Merge pull request Azure-Samples#125 from jovanpop-msft/master

Added explicit storage name
Data2AI-SARL · Nov 12, 2021 · 8cdd16f · 8cdd16f
2 parents a6623f4 + f9551b0
commit 8cdd16f
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/Manage/DeployWorkspace/azuredeploy.json b/Manage/DeployWorkspace/azuredeploy.json
@@ -3,7 +3,16 @@
     "contentVersion": "1.0.0.0",
     "parameters": {
         "name": {
-            "type": "String"
+            "type": "String",
+            "metadata": {
+                "description": "The name of the workspace."
+            }
+        },
+        "storage": {
+            "type": "String",
+            "metadata": {
+                "description": "The name of the storage. If not provided, the workspace name will be used."
+            }
         },
         "sqlAdministratorLogin": {
             "type": "String"
@@ -24,6 +33,7 @@
         }
     },
     "variables": {
+        "dataLakeStorageName": "[if(empty(parameters('storage')), replace(parameters('name'),'-',''), parameters('storage'))]",
         "cmkUriStripVersion": "[if(empty(parameters('cmkUri')), '', substring(parameters('cmkUri'), 0, lastIndexOf(parameters('cmkUri'), '/')))]",
         "withCmk": {
             "cmk": {
@@ -47,7 +57,7 @@
                 "contentVersion": "1.0.0.0"
               },
               "parameters":{
-                "storageAccount":{"value": "[replace(parameters('name'),'-','')]"},
+                "storageAccount":{"value": "[variables('dataLakeStorageName')]"},
                 "workspaceContainer":{"value": "[parameters('name')]"}
               }
             }
@@ -66,7 +76,7 @@
                 "name":{"value": "[parameters('name')]"},
                 "sqlAdministratorLogin":{"value": "[parameters('sqlAdministratorLogin')]"},
                 "sqlAdministratorPassword":{"value": "[parameters('sqlAdministratorPassword')]"},
-                "defaultDataLakeStorageAccountName":{"value": "[replace(parameters('name'),'-','')]"},
+                "defaultDataLakeStorageAccountName":{"value": "[variables('dataLakeStorageName')]"},
                 "defaultDataLakeStorageFilesystemName":{"value": "[parameters('name')]"},
                 "tagValues":{"value": "[parameters('tagValues')]"},
                 "encryption":{"value": "[variables('encryption')]"}