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

Adding workspace container
Data2AI-SARL · Nov 12, 2021 · a6623f4 · a6623f4
2 parents 5622756 + b28359d
commit a6623f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Manage/DeployWorkspace/azuredeploy.json b/Manage/DeployWorkspace/azuredeploy.json
@@ -47,7 +47,8 @@
                 "contentVersion": "1.0.0.0"
               },
               "parameters":{
-                "storageAccount":{"value": "[replace(parameters('name'),'-','')]"}
+                "storageAccount":{"value": "[replace(parameters('name'),'-','')]"},
+                "workspaceContainer":{"value": "[parameters('name')]"}
               }
             }
         },
@@ -66,6 +67,7 @@
                 "sqlAdministratorLogin":{"value": "[parameters('sqlAdministratorLogin')]"},
                 "sqlAdministratorPassword":{"value": "[parameters('sqlAdministratorPassword')]"},
                 "defaultDataLakeStorageAccountName":{"value": "[replace(parameters('name'),'-','')]"},
+                "defaultDataLakeStorageFilesystemName":{"value": "[parameters('name')]"},
                 "tagValues":{"value": "[parameters('tagValues')]"},
                 "encryption":{"value": "[variables('encryption')]"}
               }

diff --git a/Manage/DeployWorkspace/storage/azuredeploy.json b/Manage/DeployWorkspace/storage/azuredeploy.json
@@ -4,6 +4,9 @@
     "parameters": {
         "storageAccount": {
             "type": "string"
+        },
+        "workspaceContainer": {
+            "type": "string"
         }
     },
     "variables": {},
@@ -64,7 +67,7 @@
         {
             "type": "Microsoft.Storage/storageAccounts/blobServices/containers",
             "apiVersion": "2019-04-01",
-            "name": "[concat(parameters('storageAccount'), '/default/workspace')]",
+            "name": "[concat(parameters('storageAccount'), '/default/', parameters('workspaceContainer'))]",
             "dependsOn": [
                 "[resourceId('Microsoft.Storage/storageAccounts/blobServices', parameters('storageAccount'), 'default')]",
                 "[resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccount'))]"
@@ -74,4 +77,4 @@
             }
         }
     ]
-}
+}