From a5fa6fdc7ad853a1940d4348ef05a0e6d9828385 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Tue, 11 Feb 2025 12:27:46 +0800 Subject: [PATCH 1/4] add global unique suffix to resource name. --- .../src/main/arm/mainTemplate.json | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json index c9e46e4be..91a156526 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json @@ -95,9 +95,13 @@ "description": "Bool value, if it's set to true, a system assigned managed identity will to be created for the VM(s)" } }, + "utcValue": { + "type": "string", + "defaultValue": "[utcNow()]" + }, "vmName": { "type": "string", - "defaultValue": "WeblogicServerVM", + "defaultValue": "[concat('WeblogicServerVM',uniqueString(utcValue))]", "metadata": { "description": "VM name." } @@ -112,6 +116,7 @@ }, "variables": { "const_addressPrefix": "10.0.0.0/16", + "const_globalResourceNameSuffix": "[uniqueString(utcValue)]", "const_hyphen": "-", "const_imageOffer": "[concat('weblogic',variables('const_hyphen'), split(variables('name_linuxImageOfferSKU'),variables('const_hyphen'))[1],variables('const_hyphen'),split(variables('name_linuxImageOfferSKU'),variables('const_hyphen'))[2],variables('const_hyphen'),split(variables('name_linuxImageOfferSKU'),variables('const_hyphen'))[3],if(parameters('usePreviewImage'),'-preview',''))]", "const_imagePublisher": "oracle", @@ -134,11 +139,11 @@ "name_linuxImageOfferSKU": "[first(split(parameters('skuUrnVersion'), ';'))]", "name_linuxImageVersion": "[last(split(parameters('skuUrnVersion'),';'))]", "name_networkSecurityGroup": "[concat(parameters('dnsLabelPrefix'), '-nsg')]", - "name_nic": "olvm_NIC", - "name_publicIPAddress": "olvm_PublicIP", - "name_storageAccount": "[concat(take(replace(parameters('guidValue'),'-',''),6),'olvm')]", + "name_nic": "[concat('olvm_NIC_', variables('const_globalResourceNameSuffix'))]", + "name_publicIPAddress": "[concat('olvm_PublicIP_', variables('const_globalResourceNameSuffix'))]", + "name_storageAccount": "[concat('olvmstg', variables('const_globalResourceNameSuffix'))]", "name_subnet": "Subnet", - "name_virtualNetwork": "olvm_VNET", + "name_virtualNetwork": "[concat('olvm_VNET', variables('const_globalResourceNameSuffix'))]", "ref_networkSecurityGroup": "[resourceId('Microsoft.Network/networkSecurityGroups', variables('name_networkSecurityGroup'))]", "ref_subnet": "[resourceId('Microsoft.Network/virtualNetworks/subnets', variables('name_virtualNetwork'), variables('name_subnet'))]" }, From 7a6b787b7778d398c72722b80d54f0e16ca76a5a Mon Sep 17 00:00:00 2001 From: galiacheng Date: Tue, 11 Feb 2025 13:37:07 +0800 Subject: [PATCH 2/4] update API version for azure.apiVersionForStorage. --- resources/azure-common.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/azure-common.properties b/resources/azure-common.properties index 8648bea76..dcbfae78e 100644 --- a/resources/azure-common.properties +++ b/resources/azure-common.properties @@ -39,9 +39,9 @@ azure.apiVersionForDeployment=2023-07-01 # Microsoft.Resources/tags azure.apiVersionForTags=2023-07-01 # Microsoft.Storage/storageAccounts -azure.apiVersionForStorage=2023-01-01 +azure.apiVersionForStorage=2023-05-01 # Microsoft.Storage/storageAccounts/fileServices -azure.apiVersionForStorageFileService=2023-01-01 +azure.apiVersionForStorageFileService=2023-05-01 # Microsoft.Monitor/accounts azure.apiVersionForMonitorAccount=2023-04-03 From 44ef1ff36203c109d768e9c8281d85f0726188f6 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Tue, 11 Feb 2025 13:37:39 +0800 Subject: [PATCH 3/4] use unique vm name. --- .../src/main/arm/mainTemplate.json | 51 +++++++++---------- 1 file changed, 24 insertions(+), 27 deletions(-) diff --git a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json index 91a156526..a264d21d9 100644 --- a/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json +++ b/weblogic-azure-vm/arm-oraclelinux-wls/src/main/arm/mainTemplate.json @@ -95,13 +95,9 @@ "description": "Bool value, if it's set to true, a system assigned managed identity will to be created for the VM(s)" } }, - "utcValue": { - "type": "string", - "defaultValue": "[utcNow()]" - }, "vmName": { "type": "string", - "defaultValue": "[concat('WeblogicServerVM',uniqueString(utcValue))]", + "defaultValue": "WeblogicServerVM", "metadata": { "description": "VM name." } @@ -116,7 +112,7 @@ }, "variables": { "const_addressPrefix": "10.0.0.0/16", - "const_globalResourceNameSuffix": "[uniqueString(utcValue)]", + "const_globalResourceNameSuffix": "[uniqueString(parameters('guidValue'))]", "const_hyphen": "-", "const_imageOffer": "[concat('weblogic',variables('const_hyphen'), split(variables('name_linuxImageOfferSKU'),variables('const_hyphen'))[1],variables('const_hyphen'),split(variables('name_linuxImageOfferSKU'),variables('const_hyphen'))[2],variables('const_hyphen'),split(variables('name_linuxImageOfferSKU'),variables('const_hyphen'))[3],if(parameters('usePreviewImage'),'-preview',''))]", "const_imagePublisher": "oracle", @@ -138,12 +134,13 @@ "const_vmSize": "[parameters('vmSize')]", "name_linuxImageOfferSKU": "[first(split(parameters('skuUrnVersion'), ';'))]", "name_linuxImageVersion": "[last(split(parameters('skuUrnVersion'),';'))]", - "name_networkSecurityGroup": "[concat(parameters('dnsLabelPrefix'), '-nsg')]", + "name_networkSecurityGroup": "[concat(parameters('dnsLabelPrefix'), '-nsg_', variables('const_globalResourceNameSuffix'))]", "name_nic": "[concat('olvm_NIC_', variables('const_globalResourceNameSuffix'))]", "name_publicIPAddress": "[concat('olvm_PublicIP_', variables('const_globalResourceNameSuffix'))]", "name_storageAccount": "[concat('olvmstg', variables('const_globalResourceNameSuffix'))]", "name_subnet": "Subnet", - "name_virtualNetwork": "[concat('olvm_VNET', variables('const_globalResourceNameSuffix'))]", + "name_virtualNetwork": "[concat('olvm_VNET_', variables('const_globalResourceNameSuffix'))]", + "name_vmName": "[concat(parameters('vmName'), variables('const_globalResourceNameSuffix'))]", "ref_networkSecurityGroup": "[resourceId('Microsoft.Network/networkSecurityGroups', variables('name_networkSecurityGroup'))]", "ref_subnet": "[resourceId('Microsoft.Network/virtualNetworks/subnets', variables('name_virtualNetwork'), variables('name_subnet'))]" }, @@ -290,7 +287,7 @@ } ], "dnsSettings": { - "internalDnsNameLabel": "[parameters('vmName')]" + "internalDnsNameLabel": "[variables('name_vmName')]" } } }, @@ -298,7 +295,7 @@ "apiVersion": "${azure.apiVersionForVirtualMachines}", "type": "Microsoft.Compute/virtualMachines", "tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachines}')]", - "name": "[parameters('vmName')]", + "name": "[variables('name_vmName')]", "location": "[parameters('location')]", "dependsOn": [ "[resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount'))]", @@ -310,7 +307,7 @@ "vmSize": "[variables('const_vmSize')]" }, "osProfile": { - "computerName": "[parameters('vmName')]", + "computerName": "[variables('name_vmName')]", "adminUsername": "[parameters('adminUsername')]", "adminPassword": "[parameters('adminPasswordOrKey')]", "linuxConfiguration": "[if(equals(parameters('authenticationType'), 'password'), json('null'), variables('const_linuxConfiguration'))]" @@ -355,7 +352,7 @@ "type": "Microsoft.Resources/deployments", "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -373,7 +370,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -392,7 +389,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -411,7 +408,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -430,7 +427,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -449,7 +446,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -468,7 +465,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -487,7 +484,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -506,7 +503,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -525,7 +522,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -544,7 +541,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -563,7 +560,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -582,7 +579,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -601,7 +598,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -620,7 +617,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", @@ -639,7 +636,7 @@ "tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]", "condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]", "dependsOn": [ - "[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]" + "[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]" ], "properties": { "mode": "Incremental", From 0ab0eb74b055f3edb72d3de3c37f790e92600e64 Mon Sep 17 00:00:00 2001 From: galiacheng Date: Tue, 11 Feb 2025 13:40:05 +0800 Subject: [PATCH 4/4] increase pom. --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a6aadab7..afcb2aaba 100644 --- a/pom.xml +++ b/pom.xml @@ -42,7 +42,7 @@ 1.0.87 - 1.0.30 + 1.0.31 1.0.55 1.0.710000 1.0.53