Skip to content

Commit f3a2d2f

Browse files
eiximeniseiximenis
committed
Updated ARM template for SF (need only to change prefix parameter)
1 parent a1e7e9c commit f3a2d2f

2 files changed

Lines changed: 44 additions & 35 deletions

File tree

‎deploy/az/servicefabric/WindowsContainers/servicefabricdeploy.json‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
"$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
5+
"prefix": {
6+
"type": "string"
7+
},
58
"clusterLocation": {
69
"type": "string",
710
"metadata": {
@@ -233,13 +236,16 @@
233236
"publicIPApiVersion": "2015-06-15",
234237
"vnetID": "[resourceId('Microsoft.Network/virtualNetworks',parameters('virtualNetworkName'))]",
235238
"subnet0Ref": "[concat(variables('vnetID'),'/subnets/',parameters('subnet0Name'))]",
236-
"lbID0": "[resourceId('Microsoft.Network/loadBalancers', concat('LB','-', parameters('clusterName'),'-',parameters('vmNodeType0Name')))]",
239+
"lbID0": "[resourceId('Microsoft.Network/loadBalancers', concat('LB','-', variables('clusterName'),'-',parameters('vmNodeType0Name')))]",
237240
"lbIPConfig0": "[concat(variables('lbID0'),'/frontendIPConfigurations/LoadBalancerIPConfig')]",
238241
"lbPoolID0": "[concat(variables('lbID0'),'/backendAddressPools/LoadBalancerBEAddressPool')]",
239242
"lbProbeID0": "[concat(variables('lbID0'),'/probes/FabricGatewayProbe')]",
240243
"lbHttpProbeID0": "[concat(variables('lbID0'),'/probes/FabricHttpGatewayProbe')]",
241244
"lbNatPoolID0": "[concat(variables('lbID0'),'/inboundNatPools/LoadBalancerBEAddressNatPool')]",
242245
"vmStorageAccountName0": "[toLower(concat(uniqueString(resourceGroup().id), '1', '0' ))]",
246+
"supportLogStorageAccountName": "[take(concat(parameters('prefix'), parameters('supportLogStorageAccountName')),22)]",
247+
"applicationDiagnosticsStorageAccountName" : "[take(concat(parameters('prefix'), parameters('applicationDiagnosticsStorageAccountName')),22)]",
248+
"clusterName": "[concat(parameters('prefix'), parameters('clusterName'))]",
243249
"uniqueStringArray0": [
244250
"[concat(variables('vmStorageAccountName0'), '0')]",
245251
"[concat(variables('vmStorageAccountName0'), '1')]",
@@ -252,7 +258,7 @@
252258
{
253259
"apiVersion": "[variables('storageApiVersion')]",
254260
"type": "Microsoft.Storage/storageAccounts",
255-
"name": "[parameters('supportLogStorageAccountName')]",
261+
"name": "[variables('supportLogStorageAccountName')]",
256262
"location": "[parameters('computeLocation')]",
257263
"dependsOn": [],
258264
"properties": {},
@@ -262,13 +268,13 @@
262268
},
263269
"tags": {
264270
"resourceType": "Service Fabric",
265-
"clusterName": "[parameters('clusterName')]"
271+
"clusterName": "[variables('clusterName')]"
266272
}
267273
},
268274
{
269275
"apiVersion": "[variables('storageApiVersion')]",
270276
"type": "Microsoft.Storage/storageAccounts",
271-
"name": "[parameters('applicationDiagnosticsStorageAccountName')]",
277+
"name": "[variables('applicationDiagnosticsStorageAccountName')]",
272278
"location": "[parameters('computeLocation')]",
273279
"dependsOn": [],
274280
"properties": {},
@@ -278,7 +284,7 @@
278284
},
279285
"tags": {
280286
"resourceType": "Service Fabric",
281-
"clusterName": "[parameters('clusterName')]"
287+
"clusterName": "[variables('clusterName')]"
282288
}
283289
},
284290
{
@@ -304,7 +310,7 @@
304310
},
305311
"tags": {
306312
"resourceType": "Service Fabric",
307-
"clusterName": "[parameters('clusterName')]"
313+
"clusterName": "[variables('clusterName')]"
308314
}
309315
},
310316
{
@@ -320,13 +326,13 @@
320326
},
321327
"tags": {
322328
"resourceType": "Service Fabric",
323-
"clusterName": "[parameters('clusterName')]"
329+
"clusterName": "[variables('clusterName')]"
324330
}
325331
},
326332
{
327333
"apiVersion": "[variables('lbApiVersion')]",
328334
"type": "Microsoft.Network/loadBalancers",
329-
"name": "[concat('LB','-', parameters('clusterName'),'-',parameters('vmNodeType0Name'))]",
335+
"name": "[concat('LB','-', variables('clusterName'),'-',parameters('vmNodeType0Name'))]",
330336
"location": "[parameters('computeLocation')]",
331337
"dependsOn": [
332338
"[concat('Microsoft.Network/publicIPAddresses/',concat(parameters('lbIPName'),'-','0'))]"
@@ -600,7 +606,7 @@
600606
},
601607
"tags": {
602608
"resourceType": "Service Fabric",
603-
"clusterName": "[parameters('clusterName')]"
609+
"clusterName": "[variables('clusterName')]"
604610
}
605611
},
606612
{
@@ -620,7 +626,7 @@
620626
},
621627
"tags": {
622628
"resourceType": "Service Fabric",
623-
"clusterName": "[parameters('clusterName')]"
629+
"clusterName": "[variables('clusterName')]"
624630
}
625631
},
626632
{
@@ -635,9 +641,9 @@
635641
"[concat('Microsoft.Storage/storageAccounts/', variables('uniqueStringArray0')[2])]",
636642
"[concat('Microsoft.Storage/storageAccounts/', variables('uniqueStringArray0')[3])]",
637643
"[concat('Microsoft.Storage/storageAccounts/', variables('uniqueStringArray0')[4])]",
638-
"[concat('Microsoft.Network/loadBalancers/', concat('LB','-', parameters('clusterName'),'-',parameters('vmNodeType0Name')))]",
639-
"[concat('Microsoft.Storage/storageAccounts/', parameters('supportLogStorageAccountName'))]",
640-
"[concat('Microsoft.Storage/storageAccounts/', parameters('applicationDiagnosticsStorageAccountName'))]"
644+
"[concat('Microsoft.Network/loadBalancers/', concat('LB','-', variables('clusterName'),'-',parameters('vmNodeType0Name')))]",
645+
"[concat('Microsoft.Storage/storageAccounts/', variables('supportLogStorageAccountName'))]",
646+
"[concat('Microsoft.Storage/storageAccounts/', variables('applicationDiagnosticsStorageAccountName'))]"
641647
],
642648
"properties": {
643649
"overprovision": "[parameters('overProvision')]",
@@ -653,12 +659,12 @@
653659
"type": "ServiceFabricNode",
654660
"autoUpgradeMinorVersion": true,
655661
"protectedSettings": {
656-
"StorageAccountKey1": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('supportLogStorageAccountName')),'2015-05-01-preview').key1]",
657-
"StorageAccountKey2": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('supportLogStorageAccountName')),'2015-05-01-preview').key2]"
662+
"StorageAccountKey1": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('supportLogStorageAccountName')),'2015-05-01-preview').key1]",
663+
"StorageAccountKey2": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('supportLogStorageAccountName')),'2015-05-01-preview').key2]"
658664
},
659665
"publisher": "Microsoft.Azure.ServiceFabric",
660666
"settings": {
661-
"clusterEndpoint": "[reference(parameters('clusterName')).clusterEndpoint]",
667+
"clusterEndpoint": "[reference(variables('clusterName')).clusterEndpoint]",
662668
"nodeTypeRef": "[parameters('vmNodeType0Name')]",
663669
"dataPath": "D:\\\\SvcFab",
664670
"durabilityLevel": "Bronze",
@@ -674,8 +680,8 @@
674680
"type": "IaaSDiagnostics",
675681
"autoUpgradeMinorVersion": true,
676682
"protectedSettings": {
677-
"storageAccountName": "[parameters('applicationDiagnosticsStorageAccountName')]",
678-
"storageAccountKey": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('applicationDiagnosticsStorageAccountName')),'2015-05-01-preview').key1]",
683+
"storageAccountName": "[variables('applicationDiagnosticsStorageAccountName')]",
684+
"storageAccountKey": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('applicationDiagnosticsStorageAccountName')),'2015-05-01-preview').key1]",
679685
"storageAccountEndPoint": "https://core.windows.net/"
680686
},
681687
"publisher": "Microsoft.Azure.Diagnostics",
@@ -715,7 +721,7 @@
715721
}
716722
}
717723
},
718-
"StorageAccount": "[parameters('applicationDiagnosticsStorageAccountName')]"
724+
"StorageAccount": "[variables('applicationDiagnosticsStorageAccountName')]"
719725
},
720726
"typeHandlerVersion": "1.5"
721727
}
@@ -786,31 +792,31 @@
786792
},
787793
"tags": {
788794
"resourceType": "Service Fabric",
789-
"clusterName": "[parameters('clusterName')]"
795+
"clusterName": "[variables('clusterName')]"
790796
}
791797
},
792798
{
793799
"apiVersion": "2017-07-01-preview",
794800
"type": "Microsoft.ServiceFabric/clusters",
795-
"name": "[parameters('clusterName')]",
801+
"name": "[variables('clusterName')]",
796802
"location": "[parameters('clusterLocation')]",
797803
"dependsOn": [
798-
"[concat('Microsoft.Storage/storageAccounts/', parameters('supportLogStorageAccountName'))]"
804+
"[concat('Microsoft.Storage/storageAccounts/', variables('supportLogStorageAccountName'))]"
799805
],
800806
"properties": {
801807
"addonFeatures": [
802808
"DnsService"
803809
],
804810
"clientCertificateCommonNames": [],
805811
"clientCertificateThumbprints": [],
806-
"clusterCodeVersion": "5.7.207.9494",
812+
"clusterCodeVersion": "6.0.232.9494",
807813
"clusterState": "Default",
808814
"diagnosticsStorageAccountConfig": {
809-
"blobEndpoint": "[reference(concat('Microsoft.Storage/storageAccounts/', parameters('supportLogStorageAccountName')), variables('storageApiVersion')).primaryEndpoints.blob]",
815+
"blobEndpoint": "[reference(concat('Microsoft.Storage/storageAccounts/', variables('supportLogStorageAccountName')), variables('storageApiVersion')).primaryEndpoints.blob]",
810816
"protectedAccountKeyName": "StorageAccountKey1",
811-
"queueEndpoint": "[reference(concat('Microsoft.Storage/storageAccounts/', parameters('supportLogStorageAccountName')), variables('storageApiVersion')).primaryEndpoints.queue]",
812-
"storageAccountName": "[parameters('supportLogStorageAccountName')]",
813-
"tableEndpoint": "[reference(concat('Microsoft.Storage/storageAccounts/', parameters('supportLogStorageAccountName')), variables('storageApiVersion')).primaryEndpoints.table]"
817+
"queueEndpoint": "[reference(concat('Microsoft.Storage/storageAccounts/', variables('supportLogStorageAccountName')), variables('storageApiVersion')).primaryEndpoints.queue]",
818+
"storageAccountName": "[variables('supportLogStorageAccountName')]",
819+
"tableEndpoint": "[reference(concat('Microsoft.Storage/storageAccounts/', variables('supportLogStorageAccountName')), variables('storageApiVersion')).primaryEndpoints.table]"
814820
},
815821
"fabricSettings": [],
816822
"managementEndpoint": "[concat('http://',reference(concat(parameters('lbIPName'),'-','0')).dnsSettings.fqdn,':',parameters('nt0fabricHttpGatewayPort'))]",
@@ -840,13 +846,13 @@
840846
},
841847
"tags": {
842848
"resourceType": "Service Fabric",
843-
"clusterName": "[parameters('clusterName')]"
849+
"clusterName": "[variables('clusterName')]"
844850
}
845851
}
846852
],
847853
"outputs": {
848854
"clusterProperties": {
849-
"value": "[reference(parameters('clusterName'))]",
855+
"value": "[reference(variables('clusterName'))]",
850856
"type": "object"
851857
}
852858
}

‎deploy/az/servicefabric/WindowsContainers/servicefabricdeploy.parameters.json‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentParameters.json#",
33
"contentVersion": "1.0.0.0",
44
"parameters": {
5+
"prefix": {
6+
"value": "qa"
7+
},
58
"clusterName": {
6-
"value": "qa-eshop-sfwin-cluster"
9+
"value": "-eshop-sfwin-cluster"
710
},
811
"clusterLocation": {
912
"value": "westus"
@@ -12,10 +15,10 @@
1215
"value": "westus"
1316
},
1417
"adminUserName": {
15-
"value": "eshop"
18+
"value": "testedu"
1619
},
1720
"adminPassword": {
18-
"value": "Your_complex_Pass@word1"
21+
"value": "testedu1234!"
1922
},
2023
"nicName": {
2124
"value": "NIC-eshopsfwin"
@@ -24,7 +27,7 @@
2427
"value": "eshopsfwin-PubIP"
2528
},
2629
"dnsName": {
27-
"value": "qa-eshop-sfwin-cluster"
30+
"value": "testedu-eshop-sfwin-cluster"
2831
},
2932
"virtualNetworkName": {
3033
"value": "VNet-eshopsfwin"
@@ -36,10 +39,10 @@
3639
"value": "LBIP-eshopsfwin"
3740
},
3841
"applicationDiagnosticsStorageAccountName": {
39-
"value": "sfdgqaeshopsfwin"
42+
"value": "sfdiageshopw"
4043
},
4144
"supportLogStorageAccountName": {
42-
"value": "sflogsqaeshopsfwin"
45+
"value": "sflogeshopw"
4346
},
4447
"vmImageSku": {
4548
"value": "2016-Datacenter-with-Containers"

0 commit comments

Comments
 (0)