Skip to content

Commit 61dcd4e

Browse files
sanjaymantoorsanjaymantoor
authored
Added 14.1.2.0.0 images and updated cluster domain creation execution (#355)
* Updating 14.1.2.0 images and handling pack/unpack domain * Updated hostname verifier to handle unique resource name * Updated ListenAddress as part of managed-domain * Added adminVMNamePrefix parameter * Updated WebLogic and OS versions * Added remote console url at output section
1 parent 556ebc6 commit 61dcd4e

File tree

15 files changed

+436
-256
lines changed

15 files changed

+436
-256
lines changed

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,14 @@
855855
"type": "string",
856856
"value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminConsoleSecureURL.value)]"
857857
},
858+
"adminRemoteConsoleURL": {
859+
"type": "string",
860+
"value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleURL.value)]"
861+
},
862+
"adminRemoteConsoleSecureURL": {
863+
"type": "string",
864+
"value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleSecureURL.value)]"
865+
},
858866
"dnsZoneNameServers": {
859867
"type": "array",
860868
"condition": "[and(parameters('enableCustomDNS'), not(parameters('hasDNSZones')))]",

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,14 @@
872872
"adminConsoleSecureURL": {
873873
"type": "string",
874874
"value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn, reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'), '')]"
875-
}
875+
},
876+
"adminRemoteConsoleURL": {
877+
"type": "string",
878+
"value": "[uri(concat('http://', if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn, reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001'), '')]"
879+
},
880+
"adminRemoteConsoleSecureURL": {
881+
"type": "string",
882+
"value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn, reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002'), '')]"
883+
}
876884
}
877885
}

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,14 @@
960960
"adminConsoleSecureURL": {
961961
"type": "string",
962962
"value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn, reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'), '')]"
963-
}
963+
},
964+
"adminRemoteConsoleURL": {
965+
"type": "string",
966+
"value": "[uri(concat('http://', if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn, reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001'), '')]"
967+
},
968+
"adminRemoteConsoleSecureURL": {
969+
"type": "string",
970+
"value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn, reference(variables('name_nic_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002'), '')]"
971+
}
964972
}
965973
}

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,56 +15,60 @@
1515
"name": "skuUrnVersion",
1616
"type": "Microsoft.Common.DropDown",
1717
"label": "Oracle WebLogic Image",
18-
"defaultValue": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9.1",
18+
"defaultValue": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 9",
1919
"toolTip": "Choose Oracle WebLogic image, which is provided by Oracle, with Java and WebLogic preinstalled.",
2020
"constraints": {
2121
"allowedValues": [
2222
{
23-
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9.1",
24-
"value": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest"
23+
"label": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 9",
24+
"value": "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest"
2525
},
2626
{
27-
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 8.7",
28-
"value": "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest"
27+
"label": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 8",
28+
"value": "owls-141200-jdk21-ol810;Oracle:weblogic-141200-jdk21-ol810:owls-141200-jdk21-ol810;latest"
2929
},
3030
{
31-
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 9.1",
32-
"value": "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest"
31+
"label":"WebLogic Server 14.1.2.0.0 and JDK 17 on Oracle Linux 9",
32+
"value": "owls-141200-jdk17-ol94;Oracle:weblogic-141200-jdk17-ol94:owls-141200-jdk17-ol94;latest"
3333
},
3434
{
35-
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 8.7",
36-
"value": "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest"
35+
"label":"WebLogic Server 14.1.2.0.0 and JDK 17 on Oracle Linux 8",
36+
"value": "owls-141200-jdk17-ol810;Oracle:weblogic-141200-jdk17-ol810:owls-141200-jdk17-ol810;latest"
3737
},
3838
{
39-
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 9.1",
40-
"value": "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest"
39+
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9",
40+
"value": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest"
4141
},
4242
{
43-
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 8.7",
44-
"value": "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest"
43+
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 8",
44+
"value": "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest"
4545
},
4646
{
47-
"label": "WebLogic Server 12.2.1.4.0 and JDK8 on Oracle Linux 7.6",
48-
"value": "owls-122140-jdk8-ol76;Oracle:weblogic-122140-jdk8-ol76:owls-122140-jdk8-ol7;latest"
47+
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 9",
48+
"value": "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest"
4949
},
5050
{
51-
"label": "WebLogic Server 14.1.1.0.0 and JDK8 on Oracle Linux 7.6",
52-
"value": "owls-141100-jdk8-ol76;Oracle:weblogic-141100-jdk8-ol76:owls-141100-jdk8-ol7;latest"
51+
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 8",
52+
"value": "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest"
5353
},
5454
{
55-
"label": "WebLogic Server 14.1.1.0.0 and JDK11 on Oracle Linux 7.6",
56-
"value": "owls-141100-jdk11-ol76;Oracle:weblogic-141100-jdk11-ol76:owls-141100-jdk11-ol7;latest"
55+
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 9",
56+
"value": "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest"
57+
},
58+
{
59+
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 8",
60+
"value": "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest"
5761
},
5862
{
59-
"label": "WebLogic Server 14.1.1.0.0 and JDK11 on Red Hat Enterprise Linux 8.7",
63+
"label": "WebLogic Server 14.1.1.0.0 and JDK11 on Red Hat Enterprise Linux 8",
6064
"value": "owls-141100-jdk11-rhel87;Oracle:weblogic-141100-jdk11-rhel87:owls-141100-jdk11-rhel87;latest"
6165
},
6266
{
63-
"label": "WebLogic Server 14.1.1.0.0 and JDK8 on Red Hat Enterprise Linux 8.7",
67+
"label": "WebLogic Server 14.1.1.0.0 and JDK8 on Red Hat Enterprise Linux 8",
6468
"value": "owls-141100-jdk8-rhel87;Oracle:weblogic-141100-jdk8-rhel87:owls-141100-jdk8-rhel87;latest"
6569
},
6670
{
67-
"label": "WebLogic Server 12.2.1.4.0 and JDK8 on Red Hat Enterprise Linux 8.7",
71+
"label": "WebLogic Server 12.2.1.4.0 and JDK8 on Red Hat Enterprise Linux 8",
6872
"value": "owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest"
6973
}
7074
],

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -293,23 +293,21 @@
293293
},
294294
"skuUrnVersion": {
295295
"type": "string",
296-
"defaultValue": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest",
296+
"defaultValue": "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest",
297297
"allowedValues": [
298+
"owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest",
299+
"owls-141200-jdk21-ol810;Oracle:weblogic-141200-jdk21-ol810:owls-141200-jdk21-ol810;latest",
300+
"owls-141200-jdk17-ol94;Oracle:weblogic-141200-jdk17-ol94:owls-141200-jdk17-ol94;latest",
301+
"owls-141200-jdk17-ol810;Oracle:weblogic-141200-jdk17-ol810:owls-141200-jdk17-ol810;latest",
298302
"owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest",
299303
"owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest",
300304
"owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest",
301305
"owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest",
302306
"owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest",
303307
"owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest",
304-
"owls-122140-jdk8-ol76;Oracle:weblogic-122140-jdk8-ol76:owls-122140-jdk8-ol7;latest",
305-
"owls-141100-jdk8-ol76;Oracle:weblogic-141100-jdk8-ol76:owls-141100-jdk8-ol7;latest",
306-
"owls-141100-jdk11-ol76;Oracle:weblogic-141100-jdk11-ol76:owls-141100-jdk11-ol7;latest",
307308
"owls-141100-jdk11-rhel87;Oracle:weblogic-141100-jdk11-rhel87:owls-141100-jdk11-rhel87;latest",
308309
"owls-141100-jdk8-rhel87;Oracle:weblogic-141100-jdk8-rhel87:owls-141100-jdk8-rhel87;latest",
309-
"owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest",
310-
"owls-122140-jdk8-rhel76;Oracle:weblogic-122140-jdk8-rhel76:owls-122140-jdk8-rhel76;latest",
311-
"owls-141100-jdk8-rhel76;Oracle:weblogic-141100-jdk8-rhel76:owls-141100-jdk8-rhel76;latest",
312-
"owls-141100-jdk11-rhel76;Oracle:weblogic-141100-jdk11-rhel76:owls-141100-jdk11-rhel76;latest"
310+
"owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest"
313311
],
314312
"metadata": {
315313
"description": "The Oracle Linux image with Weblogic and Java preinstalled. Semicolon separated string of Sku, URN, and Version"
@@ -615,6 +613,9 @@
615613
"adminUsername": {
616614
"value": "[parameters('adminUsername')]"
617615
},
616+
"adminVMNamePrefix": {
617+
"value": "[parameters('adminVMNamePrefix')]"
618+
},
618619
"adminVMName": {
619620
"value": "[variables('name_adminVM')]"
620621
},
@@ -733,6 +734,9 @@
733734
"adminUsername": {
734735
"value": "[parameters('adminUsername')]"
735736
},
737+
"adminVMNamePrefix": {
738+
"value": "[parameters('adminVMNamePrefix')]"
739+
},
736740
"adminVMName": {
737741
"value": "[variables('name_adminVM')]"
738742
},
@@ -1191,6 +1195,9 @@
11911195
"adminVMName": {
11921196
"value": "[variables('name_adminVM')]"
11931197
},
1198+
"adminVMNamePrefix": {
1199+
"value": "[parameters('adminVMNamePrefix')]"
1200+
},
11941201
"authenticationType": {
11951202
"value": "[parameters('authenticationType')]"
11961203
},
@@ -1291,6 +1298,9 @@
12911298
"adminVMName": {
12921299
"value": "[variables('name_adminVM')]"
12931300
},
1301+
"adminVMNamePrefix": {
1302+
"value": "[parameters('adminVMNamePrefix')]"
1303+
},
12941304
"authenticationType": {
12951305
"value": "[parameters('authenticationType')]"
12961306
},
@@ -1430,6 +1440,14 @@
14301440
"type": "string",
14311441
"value": "[if(parameters('enableDNSConfiguration'), uri(format('https://{0}.{1}:7002/console/', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminSecuredConsole.value)]"
14321442
},
1443+
"adminRemoteConsoleURL": {
1444+
"type": "string",
1445+
"value": "[if(parameters('enableDNSConfiguration'), uri(format('http://{0}.{1}:7001', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleURL.value)]"
1446+
},
1447+
"adminRemoteConsoleSecuredURL": {
1448+
"type": "string",
1449+
"value": "[if(parameters('enableDNSConfiguration'), uri(format('https://{0}.{1}:7002', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleSecuredURL.value)]"
1450+
},
14331451
"appGatewayURL": {
14341452
"type": "string",
14351453
"value": "[if(parameters('enableAppGateway'), if(parameters('enableDNSConfiguration'), uri(concat('http://',parameters('dnszoneAppGatewayLabel'),'.',parameters('dnszoneName')),''), reference('appGatewayLinkedTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayURL.value),'')]"

0 commit comments

Comments
 (0)