Skip to content

Commit adac240

Browse files
vitalykorolevvitalykorolev
authored
Merge pull request #83 from marklogic/MLE-17436_image-selector-poc
MLE-17436 image selector poc
2 parents 307c10b + c72f313 commit adac240

13 files changed

+125
-31
lines changed

‎README.md‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,12 @@ For deploying MarkLogic on AWS, please visit [cloud-enablement-aws](https://gith
66

77
## Getting Started
88

9-
<a href="https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmarklogic%2Fcloud-enablement-azure%2F11.0-master%2FmainTemplate.json" target="_blank">
10-
<img src="http://azuredeploy.net/deploybutton.png"/>
11-
</a>
12-
<a href="http://armviz.io/#/?load=https://raw.githubusercontent.com/marklogic/cloud-enablement-azure/11.0-master/mainTemplate.json" target="_blank">
13-
<img src="http://armviz.io/visualizebutton.png"/>
14-
</a>
9+
[![Deploy To Azure](doc/deploy-to-azure.svg)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmarklogic%2Fcloud-enablement-azure%2F11.0-master%2FmainTemplate.json)
1510

1611
* To deploy from Azure Web Portal, navigate to [Azure Marketplace](https://azuremarketplace.microsoft.com/en-us/marketplace/apps?search=marklogic&page=1)
1712
* To deploy from this repository, click the `Deploy to Azure` button under the title
18-
* To deploy using Azure CLI (or other tools), refer to the Microsoft Azure [article](https://docs.microsoft.com/en-us/azure/azure-resource-manager/resource-group-template-deploy-cli)
19-
* To see the visualization of deployment structures, click the `Visualize` button under the title
13+
* To deploy using Azure CLI (or other tools), refer to the Microsoft Azure [article](https://learn.microsoft.com/en-us/azure/azure-resource-manager/templates/deploy-cli)
14+
* To see the visualization of deployment structures, click Azure [here](http://armviz.io/#/?load=https://raw.githubusercontent.com/marklogic/cloud-enablement-azure/11.0-master/mainTemplate.json).
2015

2116
## Reference Architecture
2217

‎createUiDefinition.json‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,26 @@
1616
},
1717
"visible": true
1818
},
19+
{
20+
"name": "ImageType",
21+
"type": "Microsoft.Common.DropDown",
22+
"label": "Image Type",
23+
"defaultValue": "Rocky Linux 8",
24+
"toolTip": "The type of image to use for the VM.",
25+
"constraints": {
26+
"allowedValues": [
27+
{
28+
"label": "Rocky Linux 8",
29+
"value": "RockyLinux8"
30+
},
31+
{
32+
"label": "Rocky Linux 9",
33+
"value": "RockyLinux9"
34+
}
35+
]
36+
},
37+
"visible": true
38+
},
1939
{
2040
"name": "numberofNodes",
2141
"type": "Microsoft.Common.OptionsGroup",
@@ -780,7 +800,8 @@
780800
"SSHPublicKey": "[steps('resourceConfig').virtualMachine.vmCredential.sshPublicKey]",
781801
"InstanceType": "[coalesce(steps('resourceConfig').instanceTypePremium,steps('resourceConfig').instanceTypeStandard)]",
782802
"HighAvailability": "[steps('marklogic').highAvailability]",
783-
"Location": "[location()]"
803+
"Location": "[location()]",
804+
"ImageType": "[basics('ImageType')]"
784805
}
785806
}
786807
}

‎doc/deploy-to-azure.svg‎

Lines changed: 67 additions & 0 deletions
Loading

‎mainTemplate.json‎

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
3-
"contentVersion": "11.3.0",
3+
"contentVersion": "11.3.1",
44
"parameters": {
55
"DeploymentName": {
66
"type": "string",
@@ -10,6 +10,25 @@
1010
"description": "The value will be used as prefix for all resources. Limit to 10 characters and spaces will be removed."
1111
}
1212
},
13+
"ImageType": {
14+
"type": "string",
15+
"allowedValues": [
16+
"RockyLinux8",
17+
"RockyLinux9"
18+
],
19+
"defaultValue": "RockyLinux8",
20+
"metadata": {
21+
"description": "The type of image to use for the VM."
22+
}
23+
},
24+
"NumberOfNodes": {
25+
"type": "int",
26+
"defaultValue": 3,
27+
"allowedValues": [1,3],
28+
"metadata": {
29+
"description": "Number of nodes in the cluster"
30+
}
31+
},
1332
"AdminUser": {
1433
"type": "string",
1534
"minLength": 0,
@@ -40,14 +59,6 @@
4059
"description": "The MarkLogic License Key or 'none' for developer license"
4160
}
4261
},
43-
"NumberOfNodes": {
44-
"type": "int",
45-
"defaultValue": 3,
46-
"allowedValues": [1,3],
47-
"metadata": {
48-
"description": "Number of nodes in the cluster"
49-
}
50-
},
5162
"VnetName": {
5263
"type": "string",
5364
"minLength": 1,
@@ -139,7 +150,7 @@
139150
"description": "The base URL for dependent assets"
140151
},
141152
"minLength": 1,
142-
"defaultValue": "https://raw.githubusercontent.com/marklogic/cloud-enablement-azure/11.3.0"
153+
"defaultValue": "https://raw.githubusercontent.com/marklogic/cloud-enablement-azure/11.3.1"
143154
},
144155
"_artifactsLocationSasToken": {
145156
"type": "securestring",
@@ -152,12 +163,12 @@
152163
"type": "string",
153164
"minLength": 1,
154165
"metadata": {
155-
"description": "The location to deploy the cluster"
166+
"description": "The location to deploy the cluster. (e.g. eastus)"
156167
}
157168
}
158169
},
159170
"variables": {
160-
"templateVersion": "11.3.0",
171+
"templateVersion": "11.3.1",
161172
"baseUrl": "[replace(parameters('_artifactsLocation'),'/mainTemplate.json','')]",
162173
"templateBaseUrl": "[concat(variables('baseUrl'),'/nestedtemplates/')]",
163174
"scriptBaseUrl": "[concat(variables('baseUrl'),'/scripts/')]",
@@ -166,7 +177,7 @@
166177
"enableAvailabilitySet": true,
167178
"enableHA": "[if(lessOrEquals(parameters('NumberOfNodes'),1),bool('false'),equals(parameters('HighAvailability'),'enable'))]",
168179
"imageOffer": "marklogic-developer-11",
169-
"imageSku": "ml1130_rockylinux8",
180+
"imageSku": "[if(equals(parameters('ImageType'), 'RockyLinux8'), 'ml1131_rockylinux8', 'ml1131_rockylinux9')]",
170181
"templateUrls": {
171182
"availabilitySetTemplateUrl": "[concat(variables('templateBaseUrl'),'availabilitySet.json',parameters('_artifactsLocationSasToken'))]",
172183
"vnetTemplateUrl": "[concat(variables('templateBaseUrl'),'virtualNetwork.json',parameters('_artifactsLocationSasToken'))]",

‎nestedtemplates/additionalNodeExt.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
3-
"contentVersion": "11.3.0",
3+
"contentVersion": "11.3.1",
44
"parameters": {
55
"extSetting": {
66
"type": "object"

‎nestedtemplates/appGateway.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
3-
"contentVersion": "11.3.0",
3+
"contentVersion": "11.3.1",
44
"parameters": {
55
"appGatewaySetting": {
66
"type": "object"

‎nestedtemplates/availabilitySet.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
3-
"contentVersion": "11.3.0",
3+
"contentVersion": "11.3.1",
44
"parameters": {
55
"availabilitySetSetting": {
66
"type": "object"

‎nestedtemplates/bootstrapNodeExt.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
3-
"contentVersion": "11.3.0",
3+
"contentVersion": "11.3.1",
44
"parameters": {
55
"extSetting": {
66
"type": "object"

‎nestedtemplates/networkInterface.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
3-
"contentVersion": "11.3.0",
3+
"contentVersion": "11.3.1",
44
"parameters": {
55
"networkInterfaceSetting": {
66
"type": "object"

‎nestedtemplates/networkSecurityGroup.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
3-
"contentVersion": "11.3.0",
3+
"contentVersion": "11.3.1",
44
"parameters": {
55
"nsgSetting": {
66
"type": "object"

0 commit comments

Comments
 (0)