Skip to content
This repository has been archived by the owner on Mar 30, 2023. It is now read-only.

Commit

Permalink
Support F-Series VMs
Browse files Browse the repository at this point in the history 
Closes #46
  • Loading branch information
@russcam
russcam committed Aug 9, 2016
1 parent 2da739c commit 8b37147
Show file tree
Hide file tree
Showing 3 changed files with 152 additions and 11 deletions.
17 changes: 14 additions & 3 deletions build/allowedValues.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,24 @@
["Standard_DS12_v2", 8, "Premium", true],
["Standard_DS13_v2", 16, "Premium", false],
["Standard_DS14_v2", 32, "Premium", false],
["Standard_DS15_v2", 40, "Premium", false]
["Standard_DS15_v2", 40, "Premium", false],

["Standard_F1", 2, "Standard", false],
["Standard_F2", 4, "Standard", false],
["Standard_F4", 8, "Standard", false],
["Standard_F8", 16, "Standard", false],
["Standard_F16", 32, "Standard", false],

["Standard_F1s", 2, "Premium", false],
["Standard_F2s", 4, "Premium", false],
["Standard_F4s", 8, "Premium", false],
["Standard_F8s", 16, "Premium", false],
["Standard_F16s", 32, "Premium", false]
],
"ignoredVmsBecauseWeHaveNo32DisksResouce" : [
"ignoredVmsBecauseWeHaveNo32DisksResource" : [
"D14", "D5_v2", "D14_v2", "DS14", "DS5_v2", "DS14_v2"
],
"ignoredVmsBecauseWeHaveNo40DisksResouce" : [
"ignoredVmsBecauseWeHaveNo40DisksResource" : [
"D15_v2", "DS15_v2"
],
"userJobTitle": [
Expand Down
48 changes: 44 additions & 4 deletions src/createUiDefinition.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,17 @@
"Standard_DS12_v2",
"Standard_DS13_v2",
"Standard_DS14_v2",
"Standard_DS15_v2"
"Standard_DS15_v2",
"Standard_F1",
"Standard_F2",
"Standard_F4",
"Standard_F8",
"Standard_F16",
"Standard_F1s",
"Standard_F2s",
"Standard_F4s",
"Standard_F8s",
"Standard_F16s"
]
},
"osPlatform": "Linux",
Expand Down Expand Up @@ -392,7 +402,17 @@
"Standard_DS12_v2",
"Standard_DS13_v2",
"Standard_DS14_v2",
"Standard_DS15_v2"
"Standard_DS15_v2",
"Standard_F1",
"Standard_F2",
"Standard_F4",
"Standard_F8",
"Standard_F16",
"Standard_F1s",
"Standard_F2s",
"Standard_F4s",
"Standard_F8s",
"Standard_F16s"
]
},
"osPlatform": "Linux",
Expand Down Expand Up @@ -527,7 +547,17 @@
"Standard_DS12_v2",
"Standard_DS13_v2",
"Standard_DS14_v2",
"Standard_DS15_v2"
"Standard_DS15_v2",
"Standard_F1",
"Standard_F2",
"Standard_F4",
"Standard_F8",
"Standard_F16",
"Standard_F1s",
"Standard_F2s",
"Standard_F4s",
"Standard_F8s",
"Standard_F16s"
]
},
"osPlatform": "Linux",
Expand Down Expand Up @@ -703,7 +733,17 @@
"Standard_DS12_v2",
"Standard_DS13_v2",
"Standard_DS14_v2",
"Standard_DS15_v2"
"Standard_DS15_v2",
"Standard_F1",
"Standard_F2",
"Standard_F4",
"Standard_F8",
"Standard_F16",
"Standard_F1s",
"Standard_F2s",
"Standard_F4s",
"Standard_F8s",
"Standard_F16s"
],
"excludedSizes": []
},
Expand Down
98 changes: 94 additions & 4 deletions src/mainTemplate.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,17 @@
"Standard_DS12_v2",
"Standard_DS13_v2",
"Standard_DS14_v2",
"Standard_DS15_v2"
"Standard_DS15_v2",
"Standard_F1",
"Standard_F2",
"Standard_F4",
"Standard_F8",
"Standard_F16",
"Standard_F1s",
"Standard_F2s",
"Standard_F4s",
"Standard_F8s",
"Standard_F16s"
],
"metadata": {
"description": "Size of the Elasticsearch data nodes"
Expand Down Expand Up @@ -184,7 +194,17 @@
"Standard_DS12_v2",
"Standard_DS13_v2",
"Standard_DS14_v2",
"Standard_DS15_v2"
"Standard_DS15_v2",
"Standard_F1",
"Standard_F2",
"Standard_F4",
"Standard_F8",
"Standard_F16",
"Standard_F1s",
"Standard_F2s",
"Standard_F4s",
"Standard_F8s",
"Standard_F16s"
],
"metadata": {
"description": "Size of the Elasticsearch data nodes"
Expand Down Expand Up @@ -255,7 +275,17 @@
"Standard_DS12_v2",
"Standard_DS13_v2",
"Standard_DS14_v2",
"Standard_DS15_v2"
"Standard_DS15_v2",
"Standard_F1",
"Standard_F2",
"Standard_F4",
"Standard_F8",
"Standard_F16",
"Standard_F1s",
"Standard_F2s",
"Standard_F4s",
"Standard_F8s",
"Standard_F16s"
],
"metadata": {
"description": "Size of the Elasticsearch master nodes, if data nodes are not master eligible 3 of these will be provisioned"
Expand Down Expand Up @@ -315,7 +345,17 @@
"Standard_DS12_v2",
"Standard_DS13_v2",
"Standard_DS14_v2",
"Standard_DS15_v2"
"Standard_DS15_v2",
"Standard_F1",
"Standard_F2",
"Standard_F4",
"Standard_F8",
"Standard_F16",
"Standard_F1s",
"Standard_F2s",
"Standard_F4s",
"Standard_F8s",
"Standard_F16s"
],
"metadata": {
"description": "Size of the Elasticsearch cluster client nodes"
Expand Down Expand Up @@ -937,6 +977,56 @@
"dataDisks": 40,
"nodesPerStorageAccount": 1,
"storageAccountType": "Premium_LRS"
},
"Standard_F1": {
"dataDisks": 2,
"nodesPerStorageAccount": 8,
"storageAccountType": "Standard_LRS"
},
"Standard_F2": {
"dataDisks": 4,
"nodesPerStorageAccount": 6,
"storageAccountType": "Standard_LRS"
},
"Standard_F4": {
"dataDisks": 8,
"nodesPerStorageAccount": 4,
"storageAccountType": "Standard_LRS"
},
"Standard_F8": {
"dataDisks": 16,
"nodesPerStorageAccount": 2,
"storageAccountType": "Standard_LRS"
},
"Standard_F16": {
"dataDisks": 32,
"nodesPerStorageAccount": 1,
"storageAccountType": "Standard_LRS"
},
"Standard_F1s": {
"dataDisks": 2,
"nodesPerStorageAccount": 8,
"storageAccountType": "Premium_LRS"
},
"Standard_F2s": {
"dataDisks": 4,
"nodesPerStorageAccount": 6,
"storageAccountType": "Premium_LRS"
},
"Standard_F4s": {
"dataDisks": 8,
"nodesPerStorageAccount": 4,
"storageAccountType": "Premium_LRS"
},
"Standard_F8s": {
"dataDisks": 16,
"nodesPerStorageAccount": 2,
"storageAccountType": "Premium_LRS"
},
"Standard_F16s": {
"dataDisks": 32,
"nodesPerStorageAccount": 1,
"storageAccountType": "Premium_LRS"
}
},
"nodesPerStorageAccount": "[variables('dataSkuSettings')[parameters('vmSizeDataNodes')].nodesPerStorageAccount]",
Expand Down

0 comments on commit 8b37147

Please sign in to comment.