Skip to content

Commit 5c8acf8

Browse files
authored
reverting back to consistent state with tp
1 parent 156e208 commit 5c8acf8

File tree

1 file changed

+19
-17
lines changed

1 file changed

+19
-17
lines changed

101-simple-windows-vm/azuredeploy.json

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,31 @@
66
"type": "string",
77
"metadata": {
88
"description": "Unique DNS Name for the Storage Account where the Virtual Machine's disks will be placed."
9-
},
10-
"defaultValue": "[replace(replace(tolower(concat('sa',resourceGroup().name)), '-', ''), '.','')]"
9+
}
1110
},
1211
"vmName": {
1312
"type": "string",
1413
"metadata": {
1514
"description": "Name of the VM."
16-
},
17-
"defaultValue": "[substring(replace(replace(tolower(concat('vm',resourceGroup().name)), '-', ''), '.',''),0,8)]"
15+
}
1816
},
1917
"adminUsername": {
2018
"type": "string",
2119
"metadata": {
2220
"description": "Username for the Virtual Machine."
23-
},
24-
"defaultValue": "vmadmin1"
21+
}
2522
},
2623
"adminPassword": {
2724
"type": "securestring",
2825
"metadata": {
29-
"description": "The password for the Administrator account of the new VMs. Default value is subscription id"
30-
},
31-
"defaultValue": "[concat('Subscription#',substring(resourcegroup().id,15,36))]"
26+
"description": "Password for the Virtual Machine."
27+
}
3228
},
3329
"dnsNameForPublicIP": {
3430
"type": "string",
3531
"metadata": {
3632
"description": "Unique DNS Name for the Public IP used to access the Virtual Machine."
37-
},
38-
"defaultValue": "[replace(replace(tolower(concat('dns',resourceGroup().name)), '-', ''), '.','')]"
33+
}
3934
},
4035
"windowsOSVersion": {
4136
"type": "string",
@@ -55,19 +50,19 @@
5550
"imagePublisher": "MicrosoftWindowsServer",
5651
"imageOffer": "WindowsServer",
5752
"OSDiskName": "osdisk",
58-
"nicName": "[replace(replace(tolower(concat('nic',resourceGroup().name)), '-', ''), '.','')]",
53+
"nicName": "myVnic",
5954
"addressPrefix": "10.0.0.0/24",
60-
"subnetName": "[replace(replace(tolower(concat('subnet',resourceGroup().name)), '-', ''), '.','')]",
55+
"subnetName": "mySubnet",
6156
"subnetPrefix": "10.0.0.0/24",
6257
"storageAccountType": "Standard_LRS",
63-
"publicIPAddressName": "[replace(replace(tolower(concat('pip',resourceGroup().name)), '-', ''), '.','')]",
58+
"publicIPAddressName": "myPublicIP",
6459
"publicIPAddressType": "Dynamic",
6560
"vmStorageAccountContainerName": "vhds",
6661
"vmSize": "Standard_A1",
67-
"virtualNetworkName": "[replace(replace(tolower(concat('vnet',resourceGroup().name)), '-', ''), '.','')]",
62+
"virtualNetworkName": "myVnet",
6863
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',variables('virtualNetworkName'))]",
6964
"subnetRef": "[concat(variables('vnetID'),'/subnets/',variables('subnetName'))]",
70-
"networkSecurityGroupName": "[replace(replace(tolower(concat('nsg',resourceGroup().name)), '-', ''), '.','')]"
65+
"networkSecurityGroupName": "mySG"
7166
},
7267
"resources": [
7368
{
@@ -141,7 +136,10 @@
141136
}
142137
}
143138
}
144-
]
139+
],
140+
"dhcpOptions": {
141+
"dnsServers": ["192.168.100.2"]
142+
}
145143
}
146144
},
147145
{
@@ -154,6 +152,9 @@
154152
"[concat('Microsoft.Network/virtualNetworks/', variables('virtualNetworkName'))]"
155153
],
156154
"properties": {
155+
"dnsSettings": {
156+
"dnsServers": ["192.168.100.2"]
157+
},
157158
"ipConfigurations": [
158159
{
159160
"name": "ipconfig1",
@@ -221,3 +222,4 @@
221222
}
222223
]
223224
}
225+

0 commit comments

Comments
 (0)