Skip to content

Commit a30abb4

Browse files
rgardler-msftrgardler-msft
committed
Merge pull request #2 from Azure/master
Merge upstream in to master
2 parents e497781 + 0310393 commit a30abb4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+3058
-532
lines changed

‎201-1-vm-loadbalancer-2-nics/azuredeploy.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@
248248
"diagnosticsProfile": {
249249
"bootDiagnostics": {
250250
"enabled": "true",
251-
"storageUri": "[concat('http://',parameters('newStorageAccountName'),'.blob.core.windows.net')]"
251+
"storageUri": "[concat('http://',parameters('StorageAccountName'),'.blob.core.windows.net')]"
252252
}
253253
}
254254
}

‎cloudera-on-centos/LICENSE.txt‎

100644100755
File mode changed.

‎cloudera-on-centos/README.md‎

100644100755
Lines changed: 99 additions & 43 deletions
Large diffs are not rendered by default.

‎cloudera-on-centos/azuredeploy-parameters.json‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
{
2+
"storageAccountPrefix": {
3+
"value": "djwemnc"
4+
},
5+
"numberOfDataNodes": {
6+
"value": 3
7+
},
8+
"dnsNamePrefix": {
9+
"value": "dkjwkj"
10+
},
11+
"region": {
12+
"value": "westus"
13+
},
14+
"storageAccountType": {
15+
"value": "Premium_LRS"
16+
},
17+
"virtualNetworkName": {
18+
"value": "klwenrk"
19+
},
20+
"subnetName": {
21+
"value": "dfklwei"
22+
},
23+
"addressPrefix": {
24+
"value": "10.0.0.0/24"
25+
},
26+
"subnetPrefix": {
27+
"value": "10.0.0.0/24"
28+
},
29+
"nodeAddressPrefix": {
30+
"value": "10.0.0."
31+
},
32+
"tshirtSize": {
33+
"value": "Eval"
34+
},
35+
"vmSize": {
36+
"value": "Standard_DS14"
37+
},
38+
"company": {
39+
"value": "Company"
40+
},
41+
"emailAddress": {
42+
"value": "[email protected]"
43+
},
44+
"businessPhone": {
45+
"value": "123456789"
46+
},
47+
"firstName": {
48+
"value": "FirstName"
49+
},
50+
"lastName": {
51+
"value": "LastName"
52+
},
53+
"jobRole": {
54+
"value": "Administrator"
55+
},
56+
"jobFunction": {
57+
"value": "Storage"
58+
}
59+
}

‎cloudera-on-centos/azuredeploy.json‎

100644100755
Lines changed: 126 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "http://schema.management.azure.com/schemas/2014-04-01-preview/deploymentTemplate.json",
2+
"$schema": "http://schema.management.azure.com/schemas/2015-01-01-preview/deploymentTemplate.json",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
55
"adminUserName": {
@@ -11,73 +11,63 @@
1111
},
1212
"adminPassword": {
1313
"type": "securestring",
14-
"defaultValue": "Eur32#1e",
1514
"metadata": {
1615
"description": "Admin password for the Virtual Machines"
1716
}
1817
},
18+
"cmUsername": {
19+
"type": "string",
20+
"defaultValue": "cmadmin",
21+
"metadata": {
22+
"description": "User name for the Cloudera Manager"
23+
}
24+
},
25+
"cmPassword": {
26+
"type": "securestring",
27+
"metadata": {
28+
"description": "password for the Cloudera Manager"
29+
}
30+
},
1931
"storageAccountPrefix": {
2032
"type": "string",
21-
"defaultValue": "defaultStorageAccountPrefix",
2233
"metadata": {
2334
"description": "Unique namespace for the Storage Account where the Virtual Machine's disks will be placed"
2435
}
2536
},
2637
"dnsNamePrefix": {
2738
"type": "string",
28-
"defaultValue": "defaultDnsNamePrefix",
2939
"metadata": {
3040
"description": "Unique public dns name where the Virtual Machines will be exposed"
3141
}
3242
},
3343
"region": {
3444
"type": "string",
45+
"defaultValue": "japanwest",
3546
"metadata": {
3647
"description": "Location where resources will be provisioned"
3748
}
3849
},
3950
"storageAccountType": {
4051
"type": "string",
41-
"defaultValue": "Standard_LRS",
52+
"defaultValue": "Premium_LRS",
4253
"metadata": {
4354
"description": "The type of the Storage Account to be created (Default to Standard_LRS)"
4455
}
4556
},
4657
"virtualNetworkName": {
4758
"type": "string",
48-
"defaultValue": "clouderaVnet",
59+
"defaultValue": "clouderavnet",
4960
"metadata": {
5061
"description": "The name of the virtual network provisioned for the deployment"
5162
}
5263
},
5364
"subnetName": {
5465
"type": "string",
55-
"defaultValue": "clouderaSubnet",
66+
"defaultValue": "clouderasubnet",
5667
"metadata": {
5768
"description": "Subnet name for the virtual network where resources will be provisioned"
5869
}
5970
},
60-
"addressPrefix": {
61-
"type": "string",
62-
"defaultValue": "10.0.0.0/24",
63-
"metadata": {
64-
"description": "The network address space for the virtual network"
65-
}
66-
},
67-
"subnetPrefix": {
68-
"type": "string",
69-
"defaultValue": "10.0.0.0/24",
70-
"metadata": {
71-
"description": "The network address space for the virtual subnet"
72-
}
73-
},
74-
"nodeAddressPrefix": {
75-
"type": "string",
76-
"defaultValue": "10.0.0.",
77-
"metadata": {
78-
"description": "The IP address prefix that will be used for constructing private IP address for each node in the cluster"
79-
}
80-
},
8171
"tshirtSize": {
8272
"type": "string",
8373
"defaultValue": "Eval",
@@ -98,65 +88,119 @@
9888
},
9989
"vmSize": {
10090
"type": "string",
101-
"defaultValue": "Standard_D14",
91+
"defaultValue": "Standard_DS14",
10292
"metadata": {
10393
"description": "The size of the VMs deployed in the cluster (Defaults to Standard_D14)"
10494
}
10595
},
106-
"keyVaultResourceGroup": {
96+
"company": {
10797
"type": "string",
108-
"defaultValue": "AzureRM-Util",
98+
"defaultValue": "Company",
10999
"metadata": {
110-
"description": "The resource group containing the key vault which provides the private key used for SSH login. See the readme for details."
100+
"description": "Your Company"
111101
}
112102
},
113-
"keyVaultName": {
103+
"emailAddress": {
114104
"type": "string",
115-
"defaultValue": "AzureRM-Keys",
105+
"defaultValue": "[email protected]",
116106
"metadata": {
117-
"description": "The name of the key vault which provides the private key used for SSH login. See the readme for details."
107+
"description": "your email"
118108
}
119109
},
120-
"keyUri": {
110+
"businessPhone": {
121111
"type": "string",
122-
"defaultValue": "https://azurerm-keys.vault.azure.net/secrets/sshKey/29a10ecf43b64c7ab7eace8866d64597",
112+
"defaultValue": "123456789",
123113
"metadata": {
124-
"description": "The url of the private key used for SSH login. See the readme for details."
114+
"description": "your business phone number"
125115
}
116+
},
117+
"firstName": {
118+
"type": "string",
119+
"defaultValue": "FirstName",
120+
"metadata": {
121+
"description": "Your FirstName"
122+
}
123+
},
124+
"lastName": {
125+
"type": "string",
126+
"defaultValue": "LastName",
127+
"metadata": {
128+
"description": "Your LastName"
129+
}
130+
},
131+
"jobRole": {
132+
"type": "string",
133+
"defaultValue": "Administrator",
134+
"allowedValues": [
135+
"Administrator",
136+
"Analyst (Industry/Finance)",
137+
"Analyst (Technical)",
138+
"Architect",
139+
"C level",
140+
"Consultant",
141+
"Developer",
142+
"Director",
143+
"Engineer",
144+
"Individual contributor",
145+
"Manager",
146+
"Partner",
147+
"Student",
148+
"VP"
149+
]
150+
},
151+
"jobFunction": {
152+
"type": "string",
153+
"defaultValue": "Analytics / Business Intelligence",
154+
"allowedValues": [
155+
"Analytics / Business Intelligence",
156+
"Big Data / Architecture",
157+
"Data Warehouse / Management",
158+
"Data Science",
159+
"Database",
160+
"ETL / ELT",
161+
"Infrastructure",
162+
"IT",
163+
"Marketing / Sales",
164+
"Networking",
165+
"Manager",
166+
"Security / Compliance",
167+
"Storage"
168+
]
126169
}
127170
},
128171
"variables": {
172+
"addressPrefix":"10.0.0.0/24",
173+
"subnetPrefix":"10.0.0.0/24",
174+
"nodeAddressPrefix":"10.0.0.",
129175
"scriptsUri": "https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/cloudera-on-centos",
130176
"storageAccount": {
131177
"prefix": "[parameters('storageAccountPrefix')]",
132178
"type": "[parameters('storageAccountType')]"
133179
},
134180
"clusterTshirtSizeEval": {
135-
"nameNodeCount": 3,
181+
"masterNodeCount": 1,
136182
"dataNodeCount": "[parameters('numberOfDataNodes')]",
137183
"highAvailability": "false"
138184
},
139185
"clusterTshirtSizeProd": {
140-
"nameNodeCount": 3,
186+
"masterNodeCount": 3,
141187
"dataNodeCount": "[parameters('numberOfDataNodes')]",
142188
"highAvailability": "true"
143189
},
144190
"clusterSpec": "[variables(concat('clusterTshirtSize', parameters('tshirtSize')))]",
145191
"vmSpec": {
146192
"vmSize": "[parameters('vmSize')]",
147-
"privateIPAddressPrefix": "[parameters('nodeAddressPrefix')]",
193+
"privateIPAddressPrefix": "[variables('nodeAddressPrefix')]",
148194
"adminUserName": "[parameters('adminUserName')]",
149195
"adminPassword": "[parameters('adminPassword')]",
150-
"keyVaultResourceId": "[resourceId(parameters('keyVaultResourceGroup'), 'Microsoft.KeyVault/vaults', parameters('keyVaultName'))]",
151-
"keyUri": "[parameters('keyUri')]",
152-
"nameNodeASName": "[concat(parameters('dnsNamePrefix'), '-nnAS')]",
196+
"masterNodeASName": "[concat(parameters('dnsNamePrefix'), '-mnAS')]",
153197
"dataNodeASName": "[concat(parameters('dnsNamePrefix'), '-dnAS')]"
154198
},
155199
"networkSpec": {
156-
"addressPrefix": "[parameters('addressPrefix')]",
157-
"subnetPrefix": "[parameters('subnetPrefix')]",
158-
"privateIPPrefix": "[parameters('nodeAddressPrefix')]",
159-
"nameNodeAddressStart": 10,
200+
"addressPrefix": "[variables('addressPrefix')]",
201+
"subnetPrefix": "[variables('subnetPrefix')]",
202+
"privateIPPrefix": "[variables('nodeAddressPrefix')]",
203+
"masterNodeAddressStart": 10,
160204
"dataNodeAddressStart": 20,
161205
"virtualNetworkName": "[parameters('virtualNetworkName')]",
162206
"virtualNetworkSubnetName": "[parameters('subnetName')]"
@@ -180,8 +224,8 @@
180224
"networkSpec": {
181225
"value": "[variables('networkSpec')]"
182226
},
183-
"nameNodeASName": {
184-
"value": "[variables('vmSpec').nameNodeASName]"
227+
"masterNodeASName": {
228+
"value": "[variables('vmSpec').masterNodeASName]"
185229
},
186230
"dataNodeASName": {
187231
"value": "[variables('vmSpec').dataNodeASName]"
@@ -190,7 +234,7 @@
190234
}
191235
},
192236
{
193-
"name": "name-node",
237+
"name": "master-node",
194238
"type": "Microsoft.Resources/deployments",
195239
"apiVersion": "2015-01-01",
196240
"dependsOn": [
@@ -199,7 +243,7 @@
199243
"properties": {
200244
"mode": "Incremental",
201245
"templateLink": {
202-
"uri": "[concat(variables('scriptsUri'), '/name-node.json')]",
246+
"uri": "[concat(variables('scriptsUri'), '/master-node.json')]",
203247
"contentVersion": "1.0.0.0"
204248
},
205249
"parameters": {
@@ -216,7 +260,7 @@
216260
"value": "[variables('storageAccount')]"
217261
},
218262
"vmCount": {
219-
"value": "[variables('clusterSpec').nameNodeCount]"
263+
"value": "[variables('clusterSpec').masterNodeCount]"
220264
},
221265
"vmSpec": {
222266
"value": "[variables('vmSpec')]"
@@ -277,7 +321,7 @@
277321
"apiVersion": "2015-01-01",
278322
"dependsOn": [
279323
"Microsoft.Resources/deployments/data-node",
280-
"Microsoft.Resources/deployments/name-node"
324+
"Microsoft.Resources/deployments/master-node"
281325
],
282326
"properties": {
283327
"mode": "Incremental",
@@ -305,7 +349,34 @@
305349
"value": "[variables('clusterSpec')]"
306350
},
307351
"fqdn": {
308-
"value": "[reference('name-node').outputs.fqdn.value]"
352+
"value": "[reference('master-node').outputs.fqdn.value]"
353+
},
354+
"cmUsername": {
355+
"value": "[parameters('cmUsername')]"
356+
},
357+
"cmPassword": {
358+
"value": "[parameters('cmPassword')]"
359+
},
360+
"company": {
361+
"value": "[parameters('Company')]"
362+
},
363+
"emailAddress": {
364+
"value": "[parameters('emailAddress')]"
365+
},
366+
"businessPhone": {
367+
"value": "[parameters('businessPhone')]"
368+
},
369+
"firstName": {
370+
"value": "[parameters('firstName')]"
371+
},
372+
"lastName": {
373+
"value": "[parameters('lastName')]"
374+
},
375+
"jobRole": {
376+
"value": "[parameters('jobRole')]"
377+
},
378+
"jobFunction": {
379+
"value": "[parameters('jobFunction')]"
309380
}
310381
}
311382
}

0 commit comments

Comments
 (0)