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

Set trial license only when INSTALL_XPACK = Yes and >= 6.3.0 #304

Merged
merged 15 commits into from
Aug 27, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions build/arm-tests/1d-0m-0c-basic-ext-kp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"description": "1 data node cluster with basic license",
"condition" : {
"range": ">=6.3.0 <6.8.0",
"reason": "a basic license can only be applied with the default distribution from 6.3.0 onwards. 6.8.0 onwards requires TLS for Transport layer"
russcam marked this conversation as resolved.
Show resolved Hide resolved
},
"isValid" : true,
"deploy" : true,
"why" : "",
"location" : "westeurope",
"parameters" : {
"loadBalancerType":{"value":"external"},
"esAdditionalYaml":{"value":""},
"xpackPlugins":{"value":"No"},
"kibana":{"value":"Yes"},
"vmSizeKibana":{"value":"Standard_DS1_v2"},
"vmSizeDataNodes":{"value":"Standard_DS1_v2"},
"vmDataNodeCount":{"value":1},
"vmDataDiskCount":{"value":1},
"vmDataDiskSize":{"value":"32GiB"},
"storageAccountType":{"value":"Default"},
"dataNodesAreMasterEligible":{"value":"Yes"},
"authenticationType":{"value":"password"}
}
}
23 changes: 23 additions & 0 deletions build/arm-tests/1d-0m-1c-ext-slb-kp.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"description": "1 data node / 1 client node cluster with Standard internal and external loadbalancers",
"isValid" : true,
"deploy" : true,
"why" : "",
"location" : "westeurope",
"parameters" : {
"vmHostNamePrefix":{"value":"p-"},
"loadBalancerType":{"value":"external"},
"loadBalancerInternalSku":{"value":"Standard"},
"loadBalancerExternalSku":{"value":"Standard"},
"kibana":{"value":"Yes"},
"vmSizeKibana":{"value":"Standard_DS1_v2"},
"vmSizeDataNodes":{"value":"Standard_DS1_v2"},
"vmDataNodeCount":{"value":1},
"vmDataDiskCount":{"value":0},
"vmDataDiskSize":{"value":"32GiB"},
"vmClientNodeCount": {"value":1},
"vmSizeClientNodes":{"value":"Standard_DS1_v2"},
"dataNodesAreMasterEligible":{"value":"Yes"},
"authenticationType":{"value":"password"}
}
}
Loading