some changes

OlegoO · May 13, 2020 · f4a554e · f4a554e
1 parent 8a50878
commit f4a554e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 13 deletions.
diff --git a/301-storage-spaces-direct-md-zones/azuredeploy.json b/301-storage-spaces-direct-md-zones/azuredeploy.json
@@ -5,12 +5,9 @@
     "location": {
     "type": "string",
     "allowedValues": [
-	"westeurope",
-	"eastus2"
 	],
-    "defaultValue": "westeurope",
     "metadata": {
-       "description": "Location for the VM, only certain regions support zones during preview."
+       "description": "Location for the VM, only certain regions support zones during, Azure Government will not use zones."
       }
     },
     "namePrefix": {
@@ -111,7 +108,7 @@
       "metadata": {
         "description": "Location of resources that the script is dependent on such as linked templates and DSC modules"
       },
-      "defaultValue": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/301-storage-spaces-direct-md-zones"
+      "defaultValue": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/301-storage-spaces-direct-md-zones/"
     },
     "_artifactsLocationSasToken": {
       "type": "securestring",
@@ -123,7 +120,7 @@
   },
   "variables": {
     "subnetRef": "[resourceId(parameters('existingVirtualNetworkRGName'), 'Microsoft.Network/virtualNetworks/subnets', parameters('existingVirtualNetworkName'), parameters('existingSubnetName'))]",
-    "deployS2DClusterTemplateURL": "[concat(parameters('_artifactsLocation'), '/nestedtemplates/deploy-s2d-cluster.json', parameters('_artifactsLocationSasToken'))]",
+    "deployS2DClusterTemplateURL": "[uri(parameters('_artifactsLocation'), concat('nestedtemplates/deploy-s2d-cluster.json', parameters('_artifactsLocationSasToken')))]",
     "deployS2DCluster": "deployS2DCluster"
   },
   "resources": [

diff --git a/301-storage-spaces-direct-md-zones/metadata.json b/301-storage-spaces-direct-md-zones/metadata.json
@@ -1,10 +1,9 @@
 {
   "$schema": "https://aka.ms/azure-quickstart-templates-metadata-schema#",
   "type": "QuickStart",
-  "itemDisplayName": "WS 2016 Storage Spaces Direct (S2D) SOFS cluster using Availability Zones",
+  "itemDisplayName": "WS2016 Storage Spaces Direct (S2D) SOFS - Availability Zones",
   "description": "This template creates Azure VMs on an existing VNET, and it provisions them as a Windows Server 2016 Storage Spaces Direct (S2D) Scale-Out File Server (SOFS) cluster.",
   "summary": "This template creates Azure VMs for a Windows Server 2016 Storage Spaces Direct (S2D) cluster on an existing Azure VNET and Active Directory domain.",
   "githubUsername": "aaronlower",
-  "dateUpdated": "2017-09-21"
+  "dateUpdated": "2020-05-10"
 }
-
diff --git a/301-storage-spaces-direct-md-zones/nestedtemplates/deploy-s2d-cluster.json b/301-storage-spaces-direct-md-zones/nestedtemplates/deploy-s2d-cluster.json
@@ -113,10 +113,10 @@
     "witnessStorageType": "Standard_LRS",
     "vmNamePrefix": "[concat(parameters('namePrefix'),'-s2d-')]",
     "clusterName": "[concat(variables('vmNamePrefix'),'c')]",
-    "vmLoopTemplateURL": "[concat(parameters('_artifactsLocation'),'/nestedtemplates/newVM.json',parameters('_artifactsLocationSasToken'))]",
-    "s2dPrepModulesURL": "[concat(parameters('_artifactsLocation'),'/dsc/prep-s2d.ps1.zip',parameters('_artifactsLocationSasToken'))]",
+    "vmLoopTemplateURL": "[uri(parameters('_artifactsLocation'), concat('nestedtemplates/newVM.json',parameters('_artifactsLocationSasToken')))]",
+    "s2dPrepModulesURL": "[uri(parameters('_artifactsLocation'), concat('dsc/prep-s2d.ps1.zip',parameters('_artifactsLocationSasToken')))]",
     "s2dPrepFunction": "PrepS2D.ps1\\PrepS2D",
-    "s2dConfigModulesURL": "[concat(parameters('_artifactsLocation'),'/dsc/config-s2d.ps1.zip',parameters('_artifactsLocationSasToken'))]",
+    "s2dConfigModulesURL": "[uri(parameters('_artifactsLocation'), concat('dsc/config-s2d.ps1.zip',parameters('_artifactsLocationSasToken')))]",
     "s2dConfigFunction": "ConfigS2D.ps1\\ConfigS2D",
     "zones": [
       "1",

diff --git a/301-storage-spaces-direct-md-zones/nestedtemplates/newVM.json b/301-storage-spaces-direct-md-zones/nestedtemplates/newVM.json
@@ -47,7 +47,7 @@
     }
   },
   "variables": {
-    "diskSelectionTemplateUri": "[concat(parameters('_artifactsLocation'),'/nestedtemplates/diskSelection.json',parameters('_artifactsLocationSasToken'))]"
+    "diskSelectionTemplateUri": "[uri(parameters('_artifactsLocation'), concat('nestedtemplates/diskSelection.json',parameters('_artifactsLocationSasToken')))]"
   },
   "resources": [
     {