Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,14 @@
"type": "string",
"value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002/console/',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminConsoleSecureURL.value)]"
},
"adminRemoteConsoleURL": {
"type": "string",
"value": "[if(parameters('enableCustomDNS'), uri(format('http://{0}.{1}:7001',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleURL.value)]"
},
"adminRemoteConsoleSecureURL": {
"type": "string",
"value": "[if(parameters('enableCustomDNS'), uri(format('https://{0}.{1}:7002',parameters('dnszoneAdminConsoleLabel'),parameters('dnszoneName')), ''),reference(variables('name_adminLinkedTemplateDeployment'),'${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleSecureURL.value)]"
},
"dnsZoneNameServers": {
"type": "array",
"condition": "[and(parameters('enableCustomDNS'), not(parameters('hasDNSZones')))]",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,14 @@
"adminConsoleSecureURL": {
"type": "string",
"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/'), '')]"
}
},
"adminRemoteConsoleURL": {
"type": "string",
"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'), '')]"
},
"adminRemoteConsoleSecureURL": {
"type": "string",
"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'), '')]"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,14 @@
"adminConsoleSecureURL": {
"type": "string",
"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/'), '')]"
}
},
"adminRemoteConsoleURL": {
"type": "string",
"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'), '')]"
},
"adminRemoteConsoleSecureURL": {
"type": "string",
"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'), '')]"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,56 +15,60 @@
"name": "skuUrnVersion",
"type": "Microsoft.Common.DropDown",
"label": "Oracle WebLogic Image",
"defaultValue": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9.1",
"defaultValue": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 9",
"toolTip": "Choose Oracle WebLogic image, which is provided by Oracle, with Java and WebLogic preinstalled.",
"constraints": {
"allowedValues": [
{
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9.1",
"value": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest"
"label": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 9",
"value": "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 8.7",
"value": "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest"
"label": "WebLogic Server 14.1.2.0.0 and JDK 21 on Oracle Linux 8",
"value": "owls-141200-jdk21-ol810;Oracle:weblogic-141200-jdk21-ol810:owls-141200-jdk21-ol810;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 9.1",
"value": "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest"
"label":"WebLogic Server 14.1.2.0.0 and JDK 17 on Oracle Linux 9",
"value": "owls-141200-jdk17-ol94;Oracle:weblogic-141200-jdk17-ol94:owls-141200-jdk17-ol94;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 8.7",
"value": "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest"
"label":"WebLogic Server 14.1.2.0.0 and JDK 17 on Oracle Linux 8",
"value": "owls-141200-jdk17-ol810;Oracle:weblogic-141200-jdk17-ol810:owls-141200-jdk17-ol810;latest"
},
{
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 9.1",
"value": "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest"
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 9",
"value": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest"
},
{
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 8.7",
"value": "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest"
"label": "WebLogic Server 14.1.1.0.0 and JDK 11 on Oracle Linux 8",
"value": "owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest"
},
{
"label": "WebLogic Server 12.2.1.4.0 and JDK8 on Oracle Linux 7.6",
"value": "owls-122140-jdk8-ol76;Oracle:weblogic-122140-jdk8-ol76:owls-122140-jdk8-ol7;latest"
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 9",
"value": "owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK8 on Oracle Linux 7.6",
"value": "owls-141100-jdk8-ol76;Oracle:weblogic-141100-jdk8-ol76:owls-141100-jdk8-ol7;latest"
"label": "WebLogic Server 14.1.1.0.0 and JDK 8 on Oracle Linux 8",
"value": "owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK11 on Oracle Linux 7.6",
"value": "owls-141100-jdk11-ol76;Oracle:weblogic-141100-jdk11-ol76:owls-141100-jdk11-ol7;latest"
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 9",
"value": "owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest"
},
{
"label": "WebLogic Server 12.2.1.4.0 and JDK 8 on Oracle Linux 8",
"value": "owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK11 on Red Hat Enterprise Linux 8.7",
"label": "WebLogic Server 14.1.1.0.0 and JDK11 on Red Hat Enterprise Linux 8",
"value": "owls-141100-jdk11-rhel87;Oracle:weblogic-141100-jdk11-rhel87:owls-141100-jdk11-rhel87;latest"
},
{
"label": "WebLogic Server 14.1.1.0.0 and JDK8 on Red Hat Enterprise Linux 8.7",
"label": "WebLogic Server 14.1.1.0.0 and JDK8 on Red Hat Enterprise Linux 8",
"value": "owls-141100-jdk8-rhel87;Oracle:weblogic-141100-jdk8-rhel87:owls-141100-jdk8-rhel87;latest"
},
{
"label": "WebLogic Server 12.2.1.4.0 and JDK8 on Red Hat Enterprise Linux 8.7",
"label": "WebLogic Server 12.2.1.4.0 and JDK8 on Red Hat Enterprise Linux 8",
"value": "owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I realize that 14.1.2 JDK 17 and 21 on RedHat Linux 8 are missing. Is this by design?

}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -293,23 +293,21 @@
},
"skuUrnVersion": {
"type": "string",
"defaultValue": "owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest",
"defaultValue": "owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest",
"allowedValues": [
"owls-141200-jdk21-ol94;Oracle:weblogic-141200-jdk21-ol94:owls-141200-jdk21-ol94;latest",
"owls-141200-jdk21-ol810;Oracle:weblogic-141200-jdk21-ol810:owls-141200-jdk21-ol810;latest",
"owls-141200-jdk17-ol94;Oracle:weblogic-141200-jdk17-ol94:owls-141200-jdk17-ol94;latest",
"owls-141200-jdk17-ol810;Oracle:weblogic-141200-jdk17-ol810:owls-141200-jdk17-ol810;latest",
"owls-141100-jdk11-ol91;Oracle:weblogic-141100-jdk11-ol91:owls-141100-jdk11-ol91;latest",
"owls-141100-jdk11-ol87;Oracle:weblogic-141100-jdk11-ol87:owls-141100-jdk11-ol87;latest",
"owls-141100-jdk8-ol91;Oracle:weblogic-141100-jdk8-ol91:owls-141100-jdk8-ol91;latest",
"owls-141100-jdk8-ol87;Oracle:weblogic-141100-jdk8-ol87:owls-141100-jdk8-ol87;latest",
"owls-122140-jdk8-ol91;Oracle:weblogic-122140-jdk8-ol91:owls-122140-jdk8-ol91;latest",
"owls-122140-jdk8-ol87;Oracle:weblogic-122140-jdk8-ol87:owls-122140-jdk8-ol87;latest",
"owls-122140-jdk8-ol76;Oracle:weblogic-122140-jdk8-ol76:owls-122140-jdk8-ol7;latest",
"owls-141100-jdk8-ol76;Oracle:weblogic-141100-jdk8-ol76:owls-141100-jdk8-ol7;latest",
"owls-141100-jdk11-ol76;Oracle:weblogic-141100-jdk11-ol76:owls-141100-jdk11-ol7;latest",
"owls-141100-jdk11-rhel87;Oracle:weblogic-141100-jdk11-rhel87:owls-141100-jdk11-rhel87;latest",
"owls-141100-jdk8-rhel87;Oracle:weblogic-141100-jdk8-rhel87:owls-141100-jdk8-rhel87;latest",
"owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest",
"owls-122140-jdk8-rhel76;Oracle:weblogic-122140-jdk8-rhel76:owls-122140-jdk8-rhel76;latest",
"owls-141100-jdk8-rhel76;Oracle:weblogic-141100-jdk8-rhel76:owls-141100-jdk8-rhel76;latest",
"owls-141100-jdk11-rhel76;Oracle:weblogic-141100-jdk11-rhel76:owls-141100-jdk11-rhel76;latest"
"owls-122140-jdk8-rhel87;Oracle:weblogic-122140-jdk8-rhel87:owls-122140-jdk8-rhel87;latest"
],
"metadata": {
"description": "The Oracle Linux image with Weblogic and Java preinstalled. Semicolon separated string of Sku, URN, and Version"
Expand Down Expand Up @@ -615,6 +613,9 @@
"adminUsername": {
"value": "[parameters('adminUsername')]"
},
"adminVMNamePrefix": {
"value": "[parameters('adminVMNamePrefix')]"
},
Comment on lines +616 to +618
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the outputs section, we do need to output the remote console URL for HTTP and HTTPS, exactly as we do in WLS on AKS.

See

output adminRemoteConsoleUrl string = const_showRemoteAdminConsoleExUrl ? networkingDeployment.outputs.adminRemoteConsoleEndpoint : ''

This is very important for usability. Without it, it's very to demonstrate the utility of the product in a pre-sales or conference meeting.

"adminVMName": {
"value": "[variables('name_adminVM')]"
},
Expand Down Expand Up @@ -733,6 +734,9 @@
"adminUsername": {
"value": "[parameters('adminUsername')]"
},
"adminVMNamePrefix": {
"value": "[parameters('adminVMNamePrefix')]"
},
"adminVMName": {
"value": "[variables('name_adminVM')]"
},
Expand Down Expand Up @@ -1191,6 +1195,9 @@
"adminVMName": {
"value": "[variables('name_adminVM')]"
},
"adminVMNamePrefix": {
"value": "[parameters('adminVMNamePrefix')]"
},
"authenticationType": {
"value": "[parameters('authenticationType')]"
},
Expand Down Expand Up @@ -1291,6 +1298,9 @@
"adminVMName": {
"value": "[variables('name_adminVM')]"
},
"adminVMNamePrefix": {
"value": "[parameters('adminVMNamePrefix')]"
},
"authenticationType": {
"value": "[parameters('authenticationType')]"
},
Expand Down Expand Up @@ -1430,6 +1440,14 @@
"type": "string",
"value": "[if(parameters('enableDNSConfiguration'), uri(format('https://{0}.{1}:7002/console/', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminSecuredConsole.value)]"
},
"adminRemoteConsoleURL": {
"type": "string",
"value": "[if(parameters('enableDNSConfiguration'), uri(format('http://{0}.{1}:7001', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleURL.value)]"
},
"adminRemoteConsoleSecuredURL": {
"type": "string",
"value": "[if(parameters('enableDNSConfiguration'), uri(format('https://{0}.{1}:7002', parameters('dnszoneAdminConsoleLabel'), parameters('dnszoneName')), ''),reference(variables('clusterTemplateRef'), '${azure.apiVersionForDeployment}').outputs.adminRemoteConsoleSecuredURL.value)]"
},
"appGatewayURL": {
"type": "string",
"value": "[if(parameters('enableAppGateway'), if(parameters('enableDNSConfiguration'), uri(concat('http://',parameters('dnszoneAppGatewayLabel'),'.',parameters('dnszoneName')),''), reference('appGatewayLinkedTemplate', '${azure.apiVersionForDeployment}').outputs.appGatewayURL.value),'')]"
Expand Down
Loading