Skip to content

Commit

Permalink
fix storageAccount param renaming mess
Browse files Browse the repository at this point in the history
  • Loading branch information
@mmarch
mmarch committed May 8, 2015
1 parent bcc5d20 commit 33f6035
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions 101-vm-with-rdp-port/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
{
"apiVersion": "2015-05-01-preview",
"type": "Microsoft.Storage/storageAccounts",
"name": "[parameters('storageAccountName')]",
"name": "[parameters('storageAccount')]",
"location": "[parameters('location')]",
"properties": {
"accountType": "Standard_LRS"
Expand Down Expand Up @@ -217,7 +217,7 @@
"name": "vm",
"location": "[parameters('location')]",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts',parameters('storageAccountName'))]",
"[resourceId('Microsoft.Storage/storageAccounts',parameters('storageAccount'))]",
"[concat('Microsoft.Network/networkInterfaces/',parameters('vmName'),'-nif')]"
],
"properties": {
Expand All @@ -239,7 +239,7 @@
"osDisk": {
"name": "osdisk",
"vhd": {
"uri": "[concat('http://',parameters('storageAccountName'),'.blob.core.windows.net/vhds/',parameters('vmName'),'-osdisk.vhd')]"
"uri": "[concat('http://',parameters('storageAccount'),'.blob.core.windows.net/vhds/',parameters('vmName'),'-osdisk.vhd')]"
},
"caching": "ReadWrite",
"createOption": "FromImage"
Expand Down
12 changes: 6 additions & 6 deletions 201-vm-domain-join/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
{
"apiVersion": "2015-05-01-preview",
"type": "Microsoft.Storage/storageAccounts",
"name": "[parameters('storageAccountName')]",
"name": "[parameters('storageAccount')]",
"location": "[resourceGroup().location]",
"properties": {
"accountType": "Standard_LRS"
Expand Down Expand Up @@ -195,7 +195,7 @@
"name": "dc-vm",
"location": "[resourceGroup().location]",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts',parameters('storageAccountName'))]",
"[resourceId('Microsoft.Storage/storageAccounts',parameters('storageAccount'))]",
"[resourceId('Microsoft.Network/networkInterfaces','dc-nif')]"
],
"properties": {
Expand All @@ -217,7 +217,7 @@
"osDisk": {
"name": "osdisk",
"vhd": {
"uri": "[concat('http://',parameters('storageAccountName'),'.blob.core.windows.net/vhds/dc-vm-osdisk.vhd')]"
"uri": "[concat('http://',parameters('storageAccount'),'.blob.core.windows.net/vhds/dc-vm-osdisk.vhd')]"
},
"caching": "ReadWrite",
"createOption": "FromImage"
Expand All @@ -226,7 +226,7 @@
{
"name": "dc-vm-data-disk1",
"vhd": {
"Uri": "[concat('http://',parameters('storageAccountName'),'.blob.core.windows.net/vhds/dc-vm-data-disk1.vhd')]"
"Uri": "[concat('http://',parameters('storageAccount'),'.blob.core.windows.net/vhds/dc-vm-data-disk1.vhd')]"
},
"caching": "None",
"createOption": "Empty",
Expand Down Expand Up @@ -350,7 +350,7 @@
"name": "vm",
"location": "[resourceGroup().location]",
"dependsOn": [
"[concat('Microsoft.Storage/storageAccounts/', parameters('storageAccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/', parameters('storageAccount'))]",
"Microsoft.Network/networkInterfaces/vm-nif"
],

Expand All @@ -374,7 +374,7 @@
"osDisk": {
"name": "osdisk",
"vhd": {
"uri": "[concat('http://',parameters('storageAccountName'),'.blob.core.windows.net/vhds/vm-osdisk.vhd')]"
"uri": "[concat('http://',parameters('storageAccount'),'.blob.core.windows.net/vhds/vm-osdisk.vhd')]"
},
"caching": "ReadWrite",
"createOption": "FromImage"
Expand Down
20 changes: 10 additions & 10 deletions rds-deployment/azuredeploy.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
{
"apiVersion": "2015-05-01-preview",
"type": "Microsoft.Storage/storageAccounts",
"name": "[parameters('storageAccountName')]",
"name": "[parameters('storageAccount')]",
"location": "[resourceGroup().location]",
"properties": {
"accountType": "Standard_LRS"
Expand Down Expand Up @@ -219,7 +219,7 @@
"name": "dc-vm",
"location": "[resourceGroup().location]",
"dependsOn": [
"[resourceId('Microsoft.Storage/storageAccounts',parameters('storageAccountName'))]",
"[resourceId('Microsoft.Storage/storageAccounts',parameters('storageAccount'))]",
"[resourceId('Microsoft.Network/networkInterfaces','dc-nif')]"
],
"properties": {
Expand All @@ -241,7 +241,7 @@
"osDisk": {
"name": "osdisk",
"vhd": {
"uri": "[concat('http://',parameters('storageAccountName'),'.blob.core.windows.net/vhds/dc-vm-os-disk.vhd')]"
"uri": "[concat('http://',parameters('storageAccount'),'.blob.core.windows.net/vhds/dc-vm-os-disk.vhd')]"
},
"caching": "ReadWrite",
"createOption": "FromImage"
Expand All @@ -250,7 +250,7 @@
{
"name": "dc-vm-data-disk",
"vhd": {
"Uri": "[concat('http://',parameters('storageAccountName'),'.blob.core.windows.net/vhds/dc-vm-data-disk.vhd')]"
"Uri": "[concat('http://',parameters('storageAccount'),'.blob.core.windows.net/vhds/dc-vm-data-disk.vhd')]"
},
"caching": "None",
"createOption": "Empty",
Expand Down Expand Up @@ -438,7 +438,7 @@
"name": "gw-vm",
"location": "[resourceGroup().location]",
"dependsOn": [
"[concat('Microsoft.Storage/storageAccounts/', parameters('storageAccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/', parameters('storageAccount'))]",
"[resourceId('Microsoft.Compute/availabilitySets', 'availabilityset')]",
"Microsoft.Network/networkInterfaces/gw-nif"
],
Expand All @@ -464,7 +464,7 @@
"osDisk": {
"name": "osdisk",
"vhd": {
"uri": "[concat('http://',parameters('storageAccountName'),'.blob.core.windows.net/vhds/gw-vm-osdisk.vhd')]"
"uri": "[concat('http://',parameters('storageAccount'),'.blob.core.windows.net/vhds/gw-vm-osdisk.vhd')]"
},
"caching": "ReadWrite",
"createOption": "FromImage"
Expand Down Expand Up @@ -522,7 +522,7 @@
"count": "[parameters('numberOfRdshInstances')]"
},
"dependsOn": [
"[concat('Microsoft.Storage/storageAccounts/', parameters('storageAccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/', parameters('storageAccount'))]",
"[concat('Microsoft.Network/networkInterfaces/', 'rdsh-', copyindex(), '-nif')]"

],
Expand All @@ -545,7 +545,7 @@
"osDisk": {
"name": "osdisk",
"vhd": {
"uri": "[concat('http://',parameters('storageAccountName'),'.blob.core.windows.net/vhds/rdsh-',copyindex(),'-osdisk.vhd')]"
"uri": "[concat('http://',parameters('storageAccount'),'.blob.core.windows.net/vhds/rdsh-',copyindex(),'-osdisk.vhd')]"
},
"caching": "ReadWrite",
"createOption": "FromImage"
Expand Down Expand Up @@ -603,7 +603,7 @@
"name": "cb-vm",
"location": "[resourceGroup().location]",
"dependsOn": [
"[concat('Microsoft.Storage/storageAccounts/', parameters('storageAccountName'))]",
"[concat('Microsoft.Storage/storageAccounts/', parameters('storageAccount'))]",
"[resourceId('Microsoft.Compute/availabilitySets', 'availabilityset')]",
"Microsoft.Network/networkInterfaces/cb-nif"
],
Expand All @@ -629,7 +629,7 @@
"osDisk": {
"name": "osdisk",
"vhd": {
"uri": "[concat('http://',parameters('storageAccountName'),'.blob.core.windows.net/vhds/cb-vm-osdisk.vhd')]"
"uri": "[concat('http://',parameters('storageAccount'),'.blob.core.windows.net/vhds/cb-vm-osdisk.vhd')]"
},
"caching": "ReadWrite",
"createOption": "FromImage"
Expand Down

0 comments on commit 33f6035

Please sign in to comment.