Skip to content

Commit

Permalink
Location fix
Browse files Browse the repository at this point in the history
Changed resource location from parameter to resourceGroup().location.
Deleted location parameter from deployment template and parameter file.
  • Loading branch information
marcvaneijk authored and kvaes committed Jun 18, 2016
1 parent 27eef9a commit 1844ec5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
16 changes: 5 additions & 11 deletions sqlvm-provisioning-csp/azuredeploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@
"description": "SQL Server Gallery Image Published Version"
}
},
"vmLocation": {
"type": "string",
"metadata": {
"description": "SQL IaaS VM data center location. User Azure location from MDSN"
}
},
"username": {
"type": "string",
"metadata": {
Expand Down Expand Up @@ -123,7 +117,7 @@
"type": "Microsoft.Storage/storageAccounts",
"name": "[parameters('storageName')]",
"apiVersion": "2015-05-01-preview",
"location": "[parameters('vmlocation')]",
"location": "[resourceGroup().location]",
"properties": {
"accountType": "[parameters('storageType')]"
}
Expand All @@ -132,7 +126,7 @@
"type": "Microsoft.Network/publicIPAddresses",
"apiVersion": "2015-05-01-preview",
"name": "[parameters('publicDnsName')]",
"location": "[parameters('vmLocation')]",
"location": "[resourceGroup().location]",
"properties": {
"publicIPAllocationMethod": "Dynamic",
"dnsSettings": {
Expand All @@ -144,7 +138,7 @@
"type": "Microsoft.Network/virtualNetworks",
"apiVersion": "2015-05-01-preview",
"name": "[parameters('vnetName')]",
"location": "[parameters('vmLocation')]",
"location": "[resourceGroup().location]",
"properties": {
"addressSpace": {
"addressPrefixes": [
Expand All @@ -165,7 +159,7 @@
"apiVersion": "2015-05-01-preview",
"type": "Microsoft.Network/networkInterfaces",
"name": "[variables('vmnic')]",
"location": "[parameters('vmLocation')]",
"location": "[resourceGroup().location]",
"dependsOn": [
"[concat('Microsoft.Network/publicIPAddresses/', parameters('publicDnsName'))]",
"[concat('Microsoft.Network/virtualNetworks/', parameters('vnetName'))]"
Expand All @@ -191,7 +185,7 @@
"type": "Microsoft.Compute/virtualMachines",
"apiVersion": "2015-05-01-preview",
"name": "[parameters('vmName')]",
"location": "[parameters('vmLocation')]",
"location": "[resourceGroup().location]",
"dependsOn": [
"[concat('Microsoft.Storage/storageAccounts/', parameters('storageName'))]",
"[concat('Microsoft.Network/networkInterfaces/', variables('vmnic'))]"
Expand Down
3 changes: 0 additions & 3 deletions sqlvm-provisioning-csp/azuredeploy.parameters.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
"vmSize": {
"value": "Standard_A2"
},
"vmLocation": {
"value": "West US"
},
"username": {
"value": "azureuser"
},
Expand Down

0 comments on commit 1844ec5

Please sign in to comment.