diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json
index 95f587fc5..885c3b05c 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/mainTemplate.json
@@ -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')))]",
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json
index 908ffbbf6..a3d771a23 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplate.json
@@ -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'), '')]"
+ }
}
}
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json
index 4b7c0e0f4..acf6ad817 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/arm/nestedtemplates/adminTemplateForCustomSSL.json
@@ -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'), '')]"
+ }
}
}
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json
index a0e39d8d6..3b5d25087 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/createUiDefinition.json
@@ -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"
}
],
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json
index 9e5d28398..e3f25483a 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/mainTemplate.json
@@ -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"
@@ -615,6 +613,9 @@
"adminUsername": {
"value": "[parameters('adminUsername')]"
},
+ "adminVMNamePrefix": {
+ "value": "[parameters('adminVMNamePrefix')]"
+ },
"adminVMName": {
"value": "[variables('name_adminVM')]"
},
@@ -733,6 +734,9 @@
"adminUsername": {
"value": "[parameters('adminUsername')]"
},
+ "adminVMNamePrefix": {
+ "value": "[parameters('adminVMNamePrefix')]"
+ },
"adminVMName": {
"value": "[variables('name_adminVM')]"
},
@@ -1191,6 +1195,9 @@
"adminVMName": {
"value": "[variables('name_adminVM')]"
},
+ "adminVMNamePrefix": {
+ "value": "[parameters('adminVMNamePrefix')]"
+ },
"authenticationType": {
"value": "[parameters('authenticationType')]"
},
@@ -1291,6 +1298,9 @@
"adminVMName": {
"value": "[variables('name_adminVM')]"
},
+ "adminVMNamePrefix": {
+ "value": "[parameters('adminVMNamePrefix')]"
+ },
"authenticationType": {
"value": "[parameters('authenticationType')]"
},
@@ -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),'')]"
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json
index 3d750c4e9..39c03f2a1 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterCustomSSLTemplate.json
@@ -48,6 +48,13 @@
"description": "Admin Server hosting VM name."
}
},
+ "adminVMNamePrefix": {
+ "defaultValue": "adminVM",
+ "type": "string",
+ "metadata": {
+ "description": "Admin Server hosting VM name prefix."
+ }
+ },
"authenticationType": {
"defaultValue": "password",
"type": "string",
@@ -108,23 +115,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"
@@ -785,7 +790,7 @@
]
},
"protectedSettings": {
- "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',string(parameters('enableCustomSSL')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0],' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]"
+ "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfInstances'),' ',variables('const_managedVMPrefix'),' ', parameters('managedServerPrefix'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ',string(parameters('enableCustomSSL')),' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0],' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]"
}
}
},
@@ -829,9 +834,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk11-ol91}",
+ "name": "${from.owls-141200-jdk21-ol94}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -849,9 +854,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk11-ol87}",
+ "name": "${from.owls-141200-jdk21-ol810}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -869,9 +874,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk8-ol91}",
+ "name": "${from.owls-141200-jdk17-ol94}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -889,9 +894,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk8-ol87}",
+ "name": "${from.owls-141200-jdk17-ol810}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -909,9 +914,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-122140-jdk8-ol91}",
+ "name": "${from.owls-141100-jdk11-ol91}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -929,47 +934,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-122140-jdk8-ol87}",
+ "name": "${from.owls-141100-jdk11-ol87}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]",
- "dependsOn": [
- "virtualMachineExtensionLoop"
- ],
- "properties": {
- "mode": "Incremental",
- "template": {
- "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
- "contentVersion": "1.0.0.0",
- "resources": [
- ]
- }
- }
- },
- {
- "type": "Microsoft.Resources/deployments",
- "apiVersion": "${azure.apiVersionForDeployment}",
- "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-122140-jdk8-ol76}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]",
- "dependsOn": [
- "virtualMachineExtensionLoop"
- ],
- "properties": {
- "mode": "Incremental",
- "template": {
- "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
- "contentVersion": "1.0.0.0",
- "resources": [
- ]
- }
- }
- },
- {
- "type": "Microsoft.Resources/deployments",
- "apiVersion": "${azure.apiVersionForDeployment}",
- "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk8-ol76}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -987,8 +954,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk11-ol76}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]",
+ "name": "${from.owls-141100-jdk8-ol91}",
+
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -1006,8 +974,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk11-rhel87}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]",
+ "name": "${from.owls-141100-jdk8-ol87}",
+
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -1025,8 +994,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk8-rhel87}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]",
+ "name": "${from.owls-122140-jdk8-ol91}",
+
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -1044,8 +1014,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-122140-jdk8-rhel87}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]",
+ "name": "${from.owls-122140-jdk8-ol87}",
+
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -1058,13 +1029,13 @@
]
}
}
- },
+ },
{
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-122140-jdk8-rhel76}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]",
+ "name": "${from.owls-141100-jdk11-rhel87}",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -1082,8 +1053,8 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk8-rhel76}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]",
+ "name": "${from.owls-141100-jdk8-rhel87}",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -1101,8 +1072,8 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk11-rhel76}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]",
+ "name": "${from.owls-122140-jdk8-rhel87}",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -1115,7 +1086,7 @@
]
}
}
- }
+ }
],
"outputs": {
"_adminPublicIPId": {
@@ -1138,6 +1109,14 @@
"type": "string",
"value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]"
},
+ "adminRemoteConsoleURL": {
+ "type": "string",
+ "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001'),'')]"
+ },
+ "adminRemoteConsoleSecuredURL": {
+ "type": "string",
+ "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002'),'')]"
+ },
"wlsDomainLocation": {
"type": "string",
"value": "[concat('/u01/domains/', parameters('wlsDomainName'))]"
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json
index 3eb2419a8..e7a133144 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/clusterTemplate.json
@@ -48,6 +48,13 @@
"description": "Admin Server hosting VM name."
}
},
+ "adminVMNamePrefix": {
+ "defaultValue": "adminVM",
+ "type": "string",
+ "metadata": {
+ "description": "Admin Server hosting VM name prefix."
+ }
+ },
"authenticationType": {
"defaultValue": "password",
"type": "string",
@@ -102,23 +109,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"
@@ -713,7 +718,7 @@
]
},
"protectedSettings": {
- "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ','false',' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'), ' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0],'\"')]"
+ "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',if(equals(copyIndex(),0),'admin',concat(parameters('managedServerPrefix'), copyIndex())),' ',parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfInstances'),' ',variables('const_managedVMPrefix'),' ', parameters('managedServerPrefix'),' ',variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersionForStorage}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ','false',' ',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'), if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn), reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),' ',parameters('dnsLabelPrefix'),' ',parameters('location'), ' ', parameters('virtualNetworkNewOrExisting'),' ',reference(resourceId('Microsoft.Network/privateEndpoints/', variables('name_privateSaEndpoint')), '${azure.apiVersionForPrivateEndpoint}').customDnsConfigs[0].ipAddresses[0],'\"')]"
}
}
},
@@ -739,9 +744,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk11-ol91}",
+ "name": "${from.owls-141200-jdk21-ol94}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol94'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -759,9 +764,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk11-ol87}",
+ "name": "${from.owls-141200-jdk21-ol810}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk21-ol810'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -779,9 +784,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk8-ol91}",
+ "name": "${from.owls-141200-jdk17-ol94}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol94'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -799,9 +804,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk8-ol87}",
+ "name": "${from.owls-141200-jdk17-ol810}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141200-jdk17-ol810'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -819,9 +824,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-122140-jdk8-ol91}",
+ "name": "${from.owls-141100-jdk11-ol91}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -839,9 +844,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-122140-jdk8-ol87}",
+ "name": "${from.owls-141100-jdk11-ol87}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -859,47 +864,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-122140-jdk8-ol76}",
+ "name": "${from.owls-141100-jdk8-ol91}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]",
- "dependsOn": [
- "virtualMachineExtensionLoop"
- ],
- "properties": {
- "mode": "Incremental",
- "template": {
- "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
- "contentVersion": "1.0.0.0",
- "resources": [
- ]
- }
- }
- },
- {
- "type": "Microsoft.Resources/deployments",
- "apiVersion": "${azure.apiVersionForDeployment}",
- "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk8-ol76}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]",
- "dependsOn": [
- "virtualMachineExtensionLoop"
- ],
- "properties": {
- "mode": "Incremental",
- "template": {
- "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
- "contentVersion": "1.0.0.0",
- "resources": [
- ]
- }
- }
- },
- {
- "type": "Microsoft.Resources/deployments",
- "apiVersion": "${azure.apiVersionForDeployment}",
- "tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk11-ol76}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -917,8 +884,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk11-rhel87}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]",
+ "name": "${from.owls-141100-jdk8-ol87}",
+
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -936,8 +904,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk8-rhel87}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]",
+ "name": "${from.owls-122140-jdk8-ol91}",
+
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -955,8 +924,9 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-122140-jdk8-rhel87}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]",
+ "name": "${from.owls-122140-jdk8-ol87}",
+
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -974,8 +944,8 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-122140-jdk8-rhel76}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]",
+ "name": "${from.owls-141100-jdk11-rhel87}",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -993,8 +963,8 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk8-rhel76}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]",
+ "name": "${from.owls-141100-jdk8-rhel87}",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -1012,8 +982,8 @@
"type": "Microsoft.Resources/deployments",
"apiVersion": "${azure.apiVersionForDeployment}",
"tags": "[parameters('tagsByResource')['${identifier.resourcesDeployment}']]",
- "name": "${from.owls-141100-jdk11-rhel76}",
- "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]",
+ "name": "${from.owls-122140-jdk8-rhel87}",
+ "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]",
"dependsOn": [
"virtualMachineExtensionLoop"
],
@@ -1026,7 +996,7 @@
]
}
}
- }
+ }
],
"outputs": {
"_adminPublicIPId": {
@@ -1049,6 +1019,14 @@
"type": "string",
"value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002/console/'),'')]"
},
+ "adminRemoteConsoleURL": {
+ "type": "string",
+ "value": "[uri(concat('http://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7001'),'')]"
+ },
+ "adminRemoteConsoleSecuredURL": {
+ "type": "string",
+ "value": "[uri(concat('https://',if(equals(parameters('virtualNetworkNewOrExisting'), 'new'),reference(variables('name_outputAdminHost_with_pub_ip'), '${azure.apiVersionForPublicIPAddresses}').dnsSettings.fqdn,reference(variables('name_outputAdminHost_without_pub_ip')).ipConfigurations[0].properties.privateIPAddress),':7002'),'')]"
+ },
"wlsDomainLocation": {
"type": "string",
"value": "[concat('/u01/domains/', parameters('wlsDomainName'))]"
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json
index 6144795df..e013979b0 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/arm/nestedtemplates/coherenceTemplate.json
@@ -48,6 +48,13 @@
"description": "Virtual machine name of which hosts WebLogic Administration Server."
}
},
+ "adminVMNamePrefix": {
+ "defaultValue": "adminVM",
+ "type": "string",
+ "metadata": {
+ "description": "Admin Server hosting VM name prefix."
+ }
+ },
"authenticationType": {
"type": "string",
"defaultValue": "password",
@@ -103,23 +110,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"
@@ -483,7 +488,7 @@
]
},
"protectedSettings": {
- "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'), ' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ', parameters('adminVMName'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersionForStorage}').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'),' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ','False',' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]"
+ "commandToExecute": "[concat('sh',' ',variables('name_scriptFile'), ' <<< \"', parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ', parameters('adminVMName'),' ',parameters('adminVMNamePrefix'),' ',parameters('_globalResourceNameSuffix'),' ',parameters('numberOfCoherenceCacheInstances'),' ',variables('name_vmPrefix'),' ',variables('const_wlsHome'),' ',variables('const_wlsDomainPath'),' ', parameters('storageAccountName'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', parameters('storageAccountName')), '${azure.apiVersionForStorage}').keys[0].value,' ', variables('const_mountPointPath'),' ', parameters('enableCoherenceWebLocalStorage'),' ',variables('name_wlsServerPrefix'),' ',copyIndex(),' ',if(parameters('enableDNSConfiguration'),parameters('customDNSNameForAdminServer'),parameters('adminVMName')),' ',parameters('dnsLabelPrefix'),' ',parameters('location'),' ','False',' ',string(parameters('enableCustomSSL')),' ',base64(parameters('sslCustomIdentityKeyStoreData')),' ',base64(parameters('sslCustomIdentityKeyStorePassPhrase')),' ',base64(parameters('sslCustomIdentityKeyStoreType')),' ',base64(parameters('sslCustomTrustKeyStoreData')),' ',base64(parameters('sslCustomTrustKeyStorePassPhrase')),' ',base64(parameters('sslCustomTrustKeyStoreType')),' ',base64(parameters('sslPrivateKeyAlias')),' ',base64(parameters('sslPrivateKeyPassPhrase')),'\"')]"
}
}
},
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/resources/README.md b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/resources/README.md
index 6217014f2..afb6e6a91 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/resources/README.md
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/resources/README.md
@@ -67,7 +67,7 @@ Provisions an n-node Oracle WebLogic Server Cluster
Long Summary
-Provisions an n-node Oracle WebLogic Server cluster on Oracle Linux 9.1, 8.7 and 7.6
+Provisions an n-node Oracle WebLogic Server cluster on Oracle Linux 9, Oracle Linux 8 and RHEL 8.
Description
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupClusterDomain.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupClusterDomain.sh
index 397699c27..d962904c7 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupClusterDomain.sh
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupClusterDomain.sh
@@ -277,9 +277,9 @@ domainInfo:
topology:
Name: "$wlsDomainName"
Machine:
- '$nmHost':
+ '$managedServerHost':
NodeManager:
- ListenAddress: "$nmHost"
+ ListenAddress: "$managedServerHost"
ListenPort: $nmPort
NMType : ssl
Cluster:
@@ -287,12 +287,13 @@ topology:
MigrationBasis: 'consensus'
Server:
'$wlsServerName' :
+ ListenAddress: "$managedServerHost"
ListenPort: $wlsManagedPort
Notes: "$wlsServerName managed server"
Cluster: "$wlsClusterName"
- Machine: "$nmHost"
+ Machine: "$managedServerHost"
ServerStart:
- Arguments: '${SERVER_STARTUP_ARGS}'
+ Arguments: '${SERVER_STARTUP_ARGS} -Dweblogic.Name=$wlsServerName -Dweblogic.management.server=${SERVER_START_URL}'
EOF
if [ "${isCustomSSLEnabled}" == "true" ];
@@ -478,6 +479,26 @@ do
done
}
+#This function to wait for packaged domain availability at ${mountpointPath} by checking ${wlsDomainName}-pack.complete
+function wait_for_packaged_template()
+{
+ #wait for packaged domain template to be available
+ count=1
+ echo "Waiting for packaged domain template availability ${mountpointPath}/${wlsDomainName}-template.jar"
+ while [ ! -f ${mountpointPath}/${wlsDomainName}-pack.complete ]
+ do
+ echo "."
+ count=$((count+1))
+ if [ $count -le 30 ];
+ then
+ sleep 1m
+ else
+ echo "Error : Maximum attempts exceeded for waiting packaged domain template ${mountpointPath}/${wlsDomainName}-template.jar"
+ exit 1
+ fi
+ done
+}
+
# Create systemctl service for nodemanager
function create_nodemanager_service()
{
@@ -599,33 +620,37 @@ function create_managedSetup(){
echo "Creating managed server model files"
create_managed_model
- create_machine_model
- create_ms_server_model
+ # Following are not requires as it is taken care by create_managed_model applied on existing domain
+ #create_machine_model
+ #create_ms_server_model
echo "Completed managed server model files"
sudo chown -R $username:$groupname $DOMAIN_PATH
- runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; $DOMAIN_PATH/weblogic-deploy/bin/createDomain.sh -oracle_home $oracleHome -domain_parent $DOMAIN_PATH -domain_type WLS -model_file $DOMAIN_PATH/managed-domain.yaml"
+ # Updating managed-domain.yaml using updateDomain.sh on existing domain created by create_admin_model
+ # wlsPassword is accepted from stdin to support old and new weblogic-deploy tool version
+ runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; $DOMAIN_PATH/weblogic-deploy/bin/updateDomain.sh -admin_url $adminWlstURL -admin_user $wlsUserName -oracle_home $oracleHome -domain_home $DOMAIN_PATH/${wlsDomainName} -domain_type WLS -model_file $DOMAIN_PATH/managed-domain.yaml <<< $wlsPassword"
if [[ $? != 0 ]]; then
echo "Error : Managed setup failed"
exit 1
fi
- wait_for_admin
-
- # For issue https://github.com/wls-eng/arm-oraclelinux-wls/issues/89
- getSerializedSystemIniFileFromShare
+
+ # Following are not required as updateDomain.sh with managed-domain.yaml will take care of following
+ #wait_for_admin
+ ## For issue https://github.com/wls-eng/arm-oraclelinux-wls/issues/89
+ #getSerializedSystemIniFileFromShare
- echo "Adding machine to managed server $wlsServerName"
- runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; java $WLST_ARGS weblogic.WLST $DOMAIN_PATH/add-machine.py"
- if [[ $? != 0 ]]; then
- echo "Error : Adding machine for managed server $wlsServerName failed"
- exit 1
- fi
- echo "Adding managed server $wlsServerName"
- runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; java $WLST_ARGS weblogic.WLST $DOMAIN_PATH/add-server.py"
- if [[ $? != 0 ]]; then
- echo "Error : Adding server $wlsServerName failed"
- exit 1
- fi
+ #echo "Adding machine to managed server $wlsServerName"
+ #runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; java $WLST_ARGS weblogic.WLST $DOMAIN_PATH/add-machine.py"
+ #if [[ $? != 0 ]]; then
+ #echo "Error : Adding machine for managed server $wlsServerName failed"
+ #exit 1
+ #fi
+ #echo "Adding managed server $wlsServerName"
+ #runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; java $WLST_ARGS weblogic.WLST $DOMAIN_PATH/add-server.py"
+ #if [[ $? != 0 ]]; then
+ #echo "Error : Adding server $wlsServerName failed"
+ #exit 1
+ #fi
}
function enabledAndStartNodeManagerService()
@@ -875,7 +900,7 @@ function generateCustomHostNameVerifier()
chown -R $username:$groupname ${CUSTOM_HOSTNAME_VERIFIER_HOME}
chmod +x ${CUSTOM_HOSTNAME_VERIFIER_HOME}/generateCustomHostNameVerifier.sh
- runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; ${CUSTOM_HOSTNAME_VERIFIER_HOME}/generateCustomHostNameVerifier.sh ${wlsAdminHost} ${customDNSNameForAdminServer} ${customDNSNameForAdminServer} ${dnsLabelPrefix} ${wlsDomainName} ${location}"
+ runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; ${CUSTOM_HOSTNAME_VERIFIER_HOME}/generateCustomHostNameVerifier.sh ${wlsAdminHost} ${customDNSNameForAdminServer} ${customDNSNameForAdminServer} ${dnsLabelPrefix} ${wlsDomainName} ${location} ${adminVMNamePrefix} ${globalResourceNameSuffix} false"
}
function copyCustomHostNameVerifierJarsToWebLogicClasspath()
@@ -930,6 +955,36 @@ function restartAdminServer()
echo "Starting WebLogic Admin Server..."
}
+function packDomain()
+{
+ echo "Stopping WebLogic nodemanager ..."
+ sudo systemctl stop wls_nodemanager
+ echo "Stopping WebLogic Admin Server..."
+ sudo systemctl stop wls_admin
+ sleep 2m
+ echo "Packing the cluster domain"
+ runuser -l oracle -c "$oracleHome/oracle_common/common/bin/pack.sh -domain=${DOMAIN_PATH}/${wlsDomainName} -template=${mountpointPath}/${wlsDomainName}-template.jar -template_name=\"${wlsDomainName} domain\" -template_desc=\"WebLogic cluster domain\" -managed=true"
+ if [[ $? != 0 ]]; then
+ echo "Error : Failed to pack the domain $wlsDomainName"
+ exit 1
+ fi
+ echo "Starting WebLogic nodemanager ..."
+ sudo systemctl start wls_nodemanager
+ echo "Starting WebLogic Admin Server..."
+ sudo systemctl start wls_admin
+ touch ${mountpointPath}/${wlsDomainName}-pack.complete
+}
+
+function unpackDomain()
+{
+ echo "Unpacking the domain"
+ runuser -l oracle -c "$oracleHome/oracle_common/common/bin/unpack.sh -template=${mountpointPath}/${wlsDomainName}-template.jar -domain=${DOMAIN_PATH}/${wlsDomainName}"
+ if [[ $? != 0 ]]; then
+ echo "Error : Failed to unpack the domain $wlsDomainName"
+ exit 1
+ fi
+}
+
#main script starts here
CURR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
@@ -942,7 +997,7 @@ CURRENT_DATE=`date +%s`
MIN_CERT_VALIDITY="1"
#read arguments from stdin
-read wlsDomainName wlsUserName wlsPassword wlsServerName wlsAdminHost oracleHome storageAccountName storageAccountKey mountpointPath isHTTPAdminListenPortEnabled isCustomSSLEnabled customDNSNameForAdminServer dnsLabelPrefix location virtualNetworkNewOrExisting storageAccountPrivateIp customIdentityKeyStoreData customIdentityKeyStorePassPhrase customIdentityKeyStoreType customTrustKeyStoreData customTrustKeyStorePassPhrase customTrustKeyStoreType serverPrivateKeyAlias serverPrivateKeyPassPhrase
+read wlsDomainName wlsUserName wlsPassword wlsServerName wlsAdminHost adminVMNamePrefix globalResourceNameSuffix numberOfInstances managedVMPrefix managedServerPrefix oracleHome storageAccountName storageAccountKey mountpointPath isHTTPAdminListenPortEnabled isCustomSSLEnabled customDNSNameForAdminServer dnsLabelPrefix location virtualNetworkNewOrExisting storageAccountPrivateIp customIdentityKeyStoreData customIdentityKeyStorePassPhrase customIdentityKeyStoreType customTrustKeyStoreData customTrustKeyStorePassPhrase customTrustKeyStoreType serverPrivateKeyAlias serverPrivateKeyPassPhrase
isHTTPAdminListenPortEnabled="${isHTTPAdminListenPortEnabled,,}"
isCustomSSLEnabled="${isCustomSSLEnabled,,}"
@@ -971,7 +1026,8 @@ SERVER_STARTUP_ARGS="-Dlog4j2.formatMsgNoLookups=true"
wlsAdminURL="$wlsAdminHost:$wlsAdminT3ChannelPort"
SERVER_START_URL="http://$wlsAdminURL"
-KEYSTORE_PATH="${DOMAIN_PATH}/${wlsDomainName}/keystores"
+# Unpack requires domain directory to be empty, hence creating outside the domain
+KEYSTORE_PATH="${DOMAIN_PATH}/keystores"
if [ "${isCustomSSLEnabled}" == "true" ];
then
@@ -1012,10 +1068,24 @@ then
enableAndStartAdminServerService
wait_for_admin
configureCustomHostNameVerifier
+ # Create managed server configuration counting from 1 to number of instances
+ countManagedServer=1
+ while [ $countManagedServer -lt $numberOfInstances ]
+ do
+ managedServerHost=${managedVMPrefix}${countManagedServer}
+ wlsServerName=${managedServerPrefix}${countManagedServer}
+ echo "Configuring managed server ${wlsServerName} for host ${managedServerHost}"
+ create_managedSetup
+ countManagedServer=`expr $countManagedServer + 1`
+ done
+ # After domain is created pack the domain and keep it under mountFileShare location
+ packDomain
else
- wait_for_admin
+ # Wait for admin host pack the domain and place the template under mountFileShare location
+ wait_for_packaged_template
updateNetworkRules "managed"
- create_managedSetup
+ # unpack the domain from the template under mountFileShare location
+ unpackDomain
generateCustomHostNameVerifier
copyCustomHostNameVerifierJarsToWebLogicClasspath
setUMaskForSecurityDir
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupCoherence.sh b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupCoherence.sh
index 5e3bcfc77..37dec4f02 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupCoherence.sh
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupCoherence.sh
@@ -224,9 +224,9 @@ domainInfo:
topology:
Name: "$wlsDomainName"
Machine:
- '$nmHost':
+ '$managedServerHost':
NodeManager:
- ListenAddress: "$nmHost"
+ ListenAddress: "$managedServerHost"
ListenPort: $nmPort
NMType : ssl
Cluster:
@@ -234,12 +234,13 @@ topology:
MigrationBasis: 'database'
Server:
'$wlsServerName' :
+ ListenAddress: "$managedServerHost"
ListenPort: $storageListenPort
Notes: "$wlsServerName managed server"
Cluster: "$storageClusterName"
- Machine: "$nmHost"
+ Machine: "$managedServerHost"
ServerStart:
- Arguments: '${SERVER_STARTUP_ARGS}'
+ Arguments: '${SERVER_STARTUP_ARGS} -Dweblogic.Name=$wlsServerName -Dweblogic.management.server=http://$wlsAdminURL ${wlsCoherenceArgs}'
EOF
if [ "${isCustomSSLEnabled}" == "true" ];
@@ -450,7 +451,7 @@ function restartManagedServers() {
connect('$wlsUserName','$wlsPassword','t3://$wlsAdminURL')
servers=cmo.getServers()
try:
- edit("$nmHost")
+ edit("$managedServerHost")
startEdit(60000,60000,'true')
for server in servers:
if (server.getCluster()!=None and server.getCluster().getName()=='${clientClusterName}'):
@@ -465,7 +466,7 @@ except Exception, e:
dumpStack()
undo('true',defaultAnswer='y')
cancelEdit('y')
- destroyEditSession("$nmHost",force = true)
+ destroyEditSession("$managedServerHost",force = true)
raise("Set coherence port range failed")
domainRuntime()
@@ -508,32 +509,38 @@ function createManagedSetup() {
echo "Creating managed server model files"
create_managed_model
- create_machine_model
- create_ms_server_model
+ # Following are not requires as it is taken care by create_managed_model applied on existing domain
+ #create_machine_model
+ #create_ms_server_model
echo "Completed managed server model files"
sudo chown -R $username:$groupname $wlsDomainPath
- runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; $wlsDomainPath/weblogic-deploy/bin/createDomain.sh -oracle_home $oracleHome -domain_parent $wlsDomainPath -domain_type WLS -model_file $wlsDomainPath/managed-domain.yaml"
+ adminWlstURL="t3://$wlsAdminURL"
+ # Updating managed-domain.yaml using updateDomain.sh on existing domain created by create_admin_model
+ # wlsPassword is accepted from stdin to support old and new weblogic-deploy tool version
+ runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; $wlsDomainPath/weblogic-deploy/bin/updateDomain.sh -admin_url $adminWlstURL -admin_user $wlsUserName -oracle_home $oracleHome -domain_home $DOMAIN_PATH/${wlsDomainName} -domain_type WLS -model_file $wlsDomainPath/managed-domain.yaml <<< $wlsPassword"
if [[ $? != 0 ]]; then
echo "Error : Managed setup failed"
exit 1
fi
- wait_for_admin
-
- # For issue https://github.com/wls-eng/arm-oraclelinux-wls/issues/89
- getSerializedSystemIniFileFromShare
-
- echo "Adding machine to managed server $wlsServerName"
- runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; java $WLST_ARGS weblogic.WLST $wlsDomainPath/add-machine.py"
- if [[ $? != 0 ]]; then
- echo "Error : Adding machine for managed server $wlsServerName failed"
- exit 1
- fi
- echo "Adding managed server $wlsServerName"
- runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; java $WLST_ARGS weblogic.WLST $wlsDomainPath/add-server.py"
- if [[ $? != 0 ]]; then
- echo "Error : Adding server $wlsServerName failed"
- exit 1
- fi
+
+ # Following are not required as updateDomain.sh with managed-domain.yaml will take care of following
+ #wait_for_admin
+
+ ## For issue https://github.com/wls-eng/arm-oraclelinux-wls/issues/89
+ #getSerializedSystemIniFileFromShare
+
+ #echo "Adding machine to managed server $wlsServerName"
+ #runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; java $WLST_ARGS weblogic.WLST $wlsDomainPath/add-machine.py"
+ #if [[ $? != 0 ]]; then
+ #echo "Error : Adding machine for managed server $wlsServerName failed"
+ #exit 1
+ #fi
+ #echo "Adding managed server $wlsServerName"
+ #runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; java $WLST_ARGS weblogic.WLST $wlsDomainPath/add-server.py"
+ #if [[ $? != 0 ]]; then
+ #echo "Error : Adding server $wlsServerName failed"
+ #exit 1
+ #fi
}
function enabledAndStartNodeManagerService() {
@@ -553,6 +560,57 @@ function enabledAndStartNodeManagerService() {
done
}
+#This function to wait for packaged domain availability at ${mountpointPath} by checking ${wlsDomainName}-pack.complete
+function wait_for_packaged_template()
+{
+ #wait for packaged domain template to be available
+ count=1
+ echo "Waiting for packaged domain template availability ${mountpointPath}/${wlsDomainName}-template.jar"
+ while [ ! -f ${mountpointPath}/${wlsDomainName}-pack.complete ]
+ do
+ echo "."
+ count=$((count+1))
+ if [ $count -le 30 ];
+ then
+ sleep 1m
+ else
+ echo "Error : Maximum attempts exceeded for waiting packaged domain template ${mountpointPath}/${wlsDomainName}-template.jar"
+ exit 1
+ fi
+ done
+}
+
+function packDomain()
+{
+ echo "Stopping WebLogic nodemanager ..."
+ sudo systemctl stop wls_nodemanager
+ echo "Stopping WebLogic Admin Server..."
+ sudo systemctl stop wls_admin
+ sleep 2m
+ echo "Packing the cluster domain"
+ runuser -l oracle -c "$oracleHome/oracle_common/common/bin/pack.sh -domain=${DOMAIN_PATH}/${wlsDomainName} -template=${mountpointPath}/${wlsDomainName}-template.jar -template_name=\"${wlsDomainName} domain\" -template_desc=\"WebLogic cluster domain\" -managed=true"
+ if [[ $? != 0 ]]; then
+ echo "Error : Failed to pack the domain $wlsDomainName"
+ exit 1
+ fi
+ echo "Starting WebLogic nodemanager ..."
+ sudo systemctl start wls_nodemanager
+ echo "Starting WebLogic Admin Server..."
+ sudo systemctl start wls_admin
+ wait_for_admin
+ touch ${mountpointPath}/${wlsDomainName}-pack.complete
+}
+
+function unpackDomain()
+{
+ echo "Unpacking the domain"
+ runuser -l oracle -c "$oracleHome/oracle_common/common/bin/unpack.sh -template=${mountpointPath}/${wlsDomainName}-template.jar -domain=${DOMAIN_PATH}/${wlsDomainName}"
+ if [[ $? != 0 ]]; then
+ echo "Error : Failed to unpack the domain $wlsDomainName"
+ exit 1
+ fi
+}
+
function cleanup() {
echo "Cleaning up temporary files..."
rm -rf $wlsDomainPath/managed-domain.yaml
@@ -561,6 +619,12 @@ function cleanup() {
echo "Cleanup completed."
}
+function cleanupTemplates() {
+ # This has to be deleted as pack command doesn't overwrite. Also managed server unpack shouldn't start before pack domain is completed
+ rm -f ${mountpointPath}/${wlsDomainName}-pack.complete
+ rm -f ${mountpointPath}/${wlsDomainName}-template.jar
+}
+
function openManagedServerPorts() {
# for Oracle Linux 7.3, 7.4, iptable is not running.
if [ -z $(command -v firewall-cmd) ]; then
@@ -698,7 +762,7 @@ function generateCustomHostNameVerifier()
chown -R $username:$groupname ${CUSTOM_HOSTNAME_VERIFIER_HOME}
chmod +x ${CUSTOM_HOSTNAME_VERIFIER_HOME}/generateCustomHostNameVerifier.sh
- runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; ${CUSTOM_HOSTNAME_VERIFIER_HOME}/generateCustomHostNameVerifier.sh ${adminVMName} ${customDNSNameForAdminServer} ${customDNSNameForAdminServer} ${dnsLabelPrefix} ${wlsDomainName} ${location}"
+ runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; ${CUSTOM_HOSTNAME_VERIFIER_HOME}/generateCustomHostNameVerifier.sh ${adminVMName} ${customDNSNameForAdminServer} ${customDNSNameForAdminServer} ${dnsLabelPrefix} ${wlsDomainName} ${location} ${adminVMNamePrefix} ${globalResourceNameSuffix} false"
}
function copyCustomHostNameVerifierJarsToWebLogicClasspath()
@@ -755,9 +819,7 @@ CURRENT_DATE=`date +%s`
# Supplied certificate to have minimum days validity for the deployment
MIN_CERT_VALIDITY="1"
-read wlsDomainName wlsUserName wlsPassword adminVMName oracleHome wlsDomainPath storageAccountName storageAccountKey mountpointPath enableWebLocalStorage managedServerPrefix serverIndex customDNSNameForAdminServer dnsLabelPrefix location addnodeFlag isCustomSSLEnabled customIdentityKeyStoreData customIdentityKeyStorePassPhrase customIdentityKeyStoreType customTrustKeyStoreData customTrustKeyStorePassPhrase customTrustKeyStoreType serverPrivateKeyAlias serverPrivateKeyPassPhrase
-
-echo "$wlsDomainName $wlsUserName $wlsPassword $adminVMName $oracleHome $wlsDomainPath $storageAccountName $storageAccountKey $mountpointPath $enableWebLocalStorage $managedServerPrefix $serverIndex $customDNSNameForAdminServer $dnsLabelPrefix $location $addnodeFlag $isCustomSSLEnabled $customIdentityKeyStoreData $customIdentityKeyStorePassPhrase $customIdentityKeyStoreType $customTrustKeyStoreData $customTrustKeyStorePassPhrase $customTrustKeyStoreType $serverPrivateKeyAlias $serverPrivateKeyPassPhrase"
+read wlsDomainName wlsUserName wlsPassword adminVMName adminVMNamePrefix globalResourceNameSuffix numberOfCoherenceCacheInstances managedVMPrefix oracleHome wlsDomainPath storageAccountName storageAccountKey mountpointPath enableWebLocalStorage managedServerPrefix serverIndex customDNSNameForAdminServer dnsLabelPrefix location addnodeFlag isCustomSSLEnabled customIdentityKeyStoreData customIdentityKeyStorePassPhrase customIdentityKeyStoreType customTrustKeyStoreData customTrustKeyStorePassPhrase customTrustKeyStoreType serverPrivateKeyAlias serverPrivateKeyPassPhrase
isCustomSSLEnabled="${isCustomSSLEnabled,,}"
@@ -766,6 +828,7 @@ then
isCustomSSLEnabled="false"
fi
+DOMAIN_PATH="/u01/domains"
wlsAdminT3ChannelPort=7005
wlsAdminURL="${adminVMName}:${wlsAdminT3ChannelPort}"
coherenceClusterName="myCoherence"
@@ -783,7 +846,7 @@ storageListenPort=7501
username="oracle"
wlsAdminServerName="admin"
wlsCoherenceArgs="-Dcoherence.localport=$coherenceLocalport -Dcoherence.localport.adjust=$coherenceLocalportAdjust"
-KEYSTORE_PATH="${wlsDomainPath}/${wlsDomainName}/keystores"
+KEYSTORE_PATH="${DOMAIN_PATH}/keystores"
SERVER_STARTUP_ARGS="-Dlog4j2.formatMsgNoLookups=true"
if [ -z "$addnodeFlag" ];
@@ -806,19 +869,32 @@ cleanup
storeCustomSSLCerts
if [ "$wlsServerName" == "${wlsAdminServerName}" ]; then
+ cleanupTemplates
createCoherenceCluster
restartManagedServers
+ countManagedServer=1
+ while [ $countManagedServer -le $numberOfCoherenceCacheInstances ]
+ do
+ managedServerHost=${managedVMPrefix}${countManagedServer}
+ wlsServerName=${managedServerPrefix}${countManagedServer}
+ echo "Configuring managed server ${wlsServerName} for host ${managedServerHost}"
+ createManagedSetup
+ countManagedServer=`expr $countManagedServer + 1`
+ done
+ packDomain
else
installUtilities
mountFileShare
openManagedServerPorts
- createManagedSetup
+ wait_for_packaged_template
+ unpackDomain
generateCustomHostNameVerifier
copyCustomHostNameVerifierJarsToWebLogicClasspath
createNodeManagerService
enabledAndStartNodeManagerService
+ wait_for_admin
configureCustomHostNameVerifier
startManagedServer
fi
-cleanup
+cleanup
\ No newline at end of file
diff --git a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/src/main/resources/marketing-artifacts/partner-center.html b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/src/main/resources/marketing-artifacts/partner-center.html
index 48e081a92..df94d7111 100644
--- a/weblogic-azure-vm/arm-oraclelinux-wls-cluster/src/main/resources/marketing-artifacts/partner-center.html
+++ b/weblogic-azure-vm/arm-oraclelinux-wls-cluster/src/main/resources/marketing-artifacts/partner-center.html
@@ -10,7 +10,7 @@ Description
across the globe. This solution automates most boilerplate steps to provision a WLS cluster on Azure VMs. Once initial
provisioning is complete, you are completely free to customize deployments further. The solution is jointly developed by Oracle and
Microsoft.
-WLS Enterprise Edition versions supported include 12.2.1.4, and 14.1.1.0.
+WLS Enterprise Edition versions supported include 12.2.1.4, 14.1.1.0 and 14.1.2.0 .
The following resources are automatically provisioned by the offer.
- Oracle Linux or Red Hat Enterprise Linux (RHEL) VMs (you can choose the number of VMs - all instances will have private
diff --git a/weblogic-azure-vm/utilities/custom-hostname-verifier/generateCustomHostNameVerifier.sh b/weblogic-azure-vm/utilities/custom-hostname-verifier/generateCustomHostNameVerifier.sh
index 2c25f77da..9562dec0b 100755
--- a/weblogic-azure-vm/utilities/custom-hostname-verifier/generateCustomHostNameVerifier.sh
+++ b/weblogic-azure-vm/utilities/custom-hostname-verifier/generateCustomHostNameVerifier.sh
@@ -2,7 +2,7 @@
function usage()
{
- echo "Usage: $0 []"
+ echo "Usage: $0 []"
exit 1
}
@@ -22,10 +22,12 @@ function readArgs()
dnsLabelPrefix="$4"
wlsDomainName="$5"
azureResourceGroupRegion="$6"
+ adminVMNamePrefix=$7
+ globalResourceNameSuffix="$8"
- if [ $# -gt 6 ];
+ if [ $# -gt 8 ];
then
- debugFlag="$7"
+ debugFlag="$9"
else
debugFlag="false"
fi
@@ -83,6 +85,9 @@ sed -i "s/adminDNSZoneName=.*/adminDNSZoneName=\"${adminDNSZoneName}\";/g" $SCRI
sed -i "s/dnsLabelPrefix=.*/dnsLabelPrefix=\"${dnsLabelPrefix}\";/g" $SCRIPT_DIR/src/main/java/HostNameValues.java
sed -i "s/wlsDomainName=.*/wlsDomainName=\"${wlsDomainName}\";/g" $SCRIPT_DIR/src/main/java/HostNameValues.java
sed -i "s/azureResourceGroupRegion=.*/azureResourceGroupRegion=\"${azureResourceGroupRegion}\";/g" $SCRIPT_DIR/src/main/java/HostNameValues.java
+sed -i "s/globalResourceNameSuffix=.*/globalResourceNameSuffix=\"${globalResourceNameSuffix}\";/g" $SCRIPT_DIR/src/main/java/HostNameValues.java
+sed -i "s/adminVMNamePrefix=.*/adminVMNamePrefix=\"${adminVMNamePrefix}\";/g" $SCRIPT_DIR/src/main/java/HostNameValues.java
+
cd $SCRIPT_DIR/src/main/java
echo "Compiling modified HostNameValues.java ..."
diff --git a/weblogic-azure-vm/utilities/custom-hostname-verifier/src/main/java/HostNameValuesTemplate.txt b/weblogic-azure-vm/utilities/custom-hostname-verifier/src/main/java/HostNameValuesTemplate.txt
index 01a7d807e..a6245dcc2 100644
--- a/weblogic-azure-vm/utilities/custom-hostname-verifier/src/main/java/HostNameValuesTemplate.txt
+++ b/weblogic-azure-vm/utilities/custom-hostname-verifier/src/main/java/HostNameValuesTemplate.txt
@@ -11,6 +11,8 @@ public class HostNameValues
private static String dnsLabelPrefix="";
private static String wlsDomainName="";
private static String azureResourceGroupRegion="";
+ private static String globalResourceNameSuffix="";
+ private static String adminVMNamePrefix="";
public static boolean isDebugEnabled()
{
@@ -46,5 +48,15 @@ public class HostNameValues
{
return azureResourceGroupRegion;
}
+
+ public static String getGlobalResourceNameSuffix()
+ {
+ return globalResourceNameSuffix;
+ }
+
+ public static String getAdminVMNamePrefix()
+ {
+ return adminVMNamePrefix;
+ }
}
diff --git a/weblogic-azure-vm/utilities/custom-hostname-verifier/src/main/java/WebLogicCustomHostNameVerifier.java b/weblogic-azure-vm/utilities/custom-hostname-verifier/src/main/java/WebLogicCustomHostNameVerifier.java
index ce39b95ec..8e8b68851 100644
--- a/weblogic-azure-vm/utilities/custom-hostname-verifier/src/main/java/WebLogicCustomHostNameVerifier.java
+++ b/weblogic-azure-vm/utilities/custom-hostname-verifier/src/main/java/WebLogicCustomHostNameVerifier.java
@@ -18,12 +18,21 @@ public boolean verify(String urlHostname, javax.net.ssl.SSLSession session)
.append(".")
.append(HostNameValues.azureVMExternalDomainName.toLowerCase()).toString();
+ String vmNameSubString = new StringBuilder(HostNameValues.getGlobalResourceNameSuffix()).toString();
+ debug("vmNameSubString:"+vmNameSubString);
+
if(commonName.equalsIgnoreCase(urlHostname))
{
debug("urlhostname matching certificate common name");
return true;
}
else
+ if(commonName.startsWith(HostNameValues.getAdminVMNamePrefix()) && urlHostname.contains(vmNameSubString))
+ {
+ debug("matching with certificate common name and vmname");
+ return true;
+ }
+ else
if(commonName.equalsIgnoreCase(HostNameValues.getAdminInternalHostName()))
{
debug("urlhostname matching certificate common name: "+HostNameValues.getAdminInternalHostName()+","+commonName);