Skip to content

Commit edb156d

Browse files
galiachenggaliacheng
authored
Support re-deployment in the same resource group for single node offer (#339)
* add global unique suffix to resource name. * update API version for azure.apiVersionForStorage. * use unique vm name. * increase pom.
1 parent 485d227 commit edb156d

File tree

3 files changed

+29
-27
lines changed

3 files changed

+29
-27
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<!-- weblogic azure aks versions -->
4343
<version.wls-on-aks-azure-marketplace>1.0.87</version.wls-on-aks-azure-marketplace>
4444
<!-- weblogic azure vm versions -->
45-
<version.arm-oraclelinux-wls>1.0.30</version.arm-oraclelinux-wls>
45+
<version.arm-oraclelinux-wls>1.0.31</version.arm-oraclelinux-wls>
4646
<version.arm-oraclelinux-wls-admin>1.0.55</version.arm-oraclelinux-wls-admin>
4747
<version.arm-oraclelinux-wls-cluster>1.0.710000</version.arm-oraclelinux-wls-cluster>
4848
<version.arm-oraclelinux-wls-dynamic-cluster>1.0.53</version.arm-oraclelinux-wls-dynamic-cluster>

‎resources/azure-common.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ azure.apiVersionForDeployment=2023-07-01
3939
# Microsoft.Resources/tags
4040
azure.apiVersionForTags=2023-07-01
4141
# Microsoft.Storage/storageAccounts
42-
azure.apiVersionForStorage=2023-01-01
42+
azure.apiVersionForStorage=2023-05-01
4343
# Microsoft.Storage/storageAccounts/fileServices
44-
azure.apiVersionForStorageFileService=2023-01-01
44+
azure.apiVersionForStorageFileService=2023-05-01
4545
# Microsoft.Monitor/accounts
4646
azure.apiVersionForMonitorAccount=2023-04-03
4747

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

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
},
113113
"variables": {
114114
"const_addressPrefix": "10.0.0.0/16",
115+
"const_globalResourceNameSuffix": "[uniqueString(parameters('guidValue'))]",
115116
"const_hyphen": "-",
116117
"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',''))]",
117118
"const_imagePublisher": "oracle",
@@ -133,12 +134,13 @@
133134
"const_vmSize": "[parameters('vmSize')]",
134135
"name_linuxImageOfferSKU": "[first(split(parameters('skuUrnVersion'), ';'))]",
135136
"name_linuxImageVersion": "[last(split(parameters('skuUrnVersion'),';'))]",
136-
"name_networkSecurityGroup": "[concat(parameters('dnsLabelPrefix'), '-nsg')]",
137-
"name_nic": "olvm_NIC",
138-
"name_publicIPAddress": "olvm_PublicIP",
139-
"name_storageAccount": "[concat(take(replace(parameters('guidValue'),'-',''),6),'olvm')]",
137+
"name_networkSecurityGroup": "[concat(parameters('dnsLabelPrefix'), '-nsg_', variables('const_globalResourceNameSuffix'))]",
138+
"name_nic": "[concat('olvm_NIC_', variables('const_globalResourceNameSuffix'))]",
139+
"name_publicIPAddress": "[concat('olvm_PublicIP_', variables('const_globalResourceNameSuffix'))]",
140+
"name_storageAccount": "[concat('olvmstg', variables('const_globalResourceNameSuffix'))]",
140141
"name_subnet": "Subnet",
141-
"name_virtualNetwork": "olvm_VNET",
142+
"name_virtualNetwork": "[concat('olvm_VNET_', variables('const_globalResourceNameSuffix'))]",
143+
"name_vmName": "[concat(parameters('vmName'), variables('const_globalResourceNameSuffix'))]",
142144
"ref_networkSecurityGroup": "[resourceId('Microsoft.Network/networkSecurityGroups', variables('name_networkSecurityGroup'))]",
143145
"ref_subnet": "[resourceId('Microsoft.Network/virtualNetworks/subnets', variables('name_virtualNetwork'), variables('name_subnet'))]"
144146
},
@@ -285,15 +287,15 @@
285287
}
286288
],
287289
"dnsSettings": {
288-
"internalDnsNameLabel": "[parameters('vmName')]"
290+
"internalDnsNameLabel": "[variables('name_vmName')]"
289291
}
290292
}
291293
},
292294
{
293295
"apiVersion": "${azure.apiVersionForVirtualMachines}",
294296
"type": "Microsoft.Compute/virtualMachines",
295297
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'), '${identifier.virtualMachines}')]",
296-
"name": "[parameters('vmName')]",
298+
"name": "[variables('name_vmName')]",
297299
"location": "[parameters('location')]",
298300
"dependsOn": [
299301
"[resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount'))]",
@@ -305,7 +307,7 @@
305307
"vmSize": "[variables('const_vmSize')]"
306308
},
307309
"osProfile": {
308-
"computerName": "[parameters('vmName')]",
310+
"computerName": "[variables('name_vmName')]",
309311
"adminUsername": "[parameters('adminUsername')]",
310312
"adminPassword": "[parameters('adminPasswordOrKey')]",
311313
"linuxConfiguration": "[if(equals(parameters('authenticationType'), 'password'), json('null'), variables('const_linuxConfiguration'))]"
@@ -350,7 +352,7 @@
350352
"type": "Microsoft.Resources/deployments",
351353
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
352354
"dependsOn": [
353-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
355+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
354356
],
355357
"properties": {
356358
"mode": "Incremental",
@@ -368,7 +370,7 @@
368370
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
369371
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol91'), bool('true'), bool('false'))]",
370372
"dependsOn": [
371-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
373+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
372374
],
373375
"properties": {
374376
"mode": "Incremental",
@@ -387,7 +389,7 @@
387389
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
388390
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol87'), bool('true'), bool('false'))]",
389391
"dependsOn": [
390-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
392+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
391393
],
392394
"properties": {
393395
"mode": "Incremental",
@@ -406,7 +408,7 @@
406408
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
407409
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol91'), bool('true'), bool('false'))]",
408410
"dependsOn": [
409-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
411+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
410412
],
411413
"properties": {
412414
"mode": "Incremental",
@@ -425,7 +427,7 @@
425427
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
426428
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol87'), bool('true'), bool('false'))]",
427429
"dependsOn": [
428-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
430+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
429431
],
430432
"properties": {
431433
"mode": "Incremental",
@@ -444,7 +446,7 @@
444446
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
445447
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol91'), bool('true'), bool('false'))]",
446448
"dependsOn": [
447-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
449+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
448450
],
449451
"properties": {
450452
"mode": "Incremental",
@@ -463,7 +465,7 @@
463465
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
464466
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-ol87'), bool('true'), bool('false'))]",
465467
"dependsOn": [
466-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
468+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
467469
],
468470
"properties": {
469471
"mode": "Incremental",
@@ -482,7 +484,7 @@
482484
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
483485
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]",
484486
"dependsOn": [
485-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
487+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
486488
],
487489
"properties": {
488490
"mode": "Incremental",
@@ -501,7 +503,7 @@
501503
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
502504
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]",
503505
"dependsOn": [
504-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
506+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
505507
],
506508
"properties": {
507509
"mode": "Incremental",
@@ -520,7 +522,7 @@
520522
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
521523
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]",
522524
"dependsOn": [
523-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
525+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
524526
],
525527
"properties": {
526528
"mode": "Incremental",
@@ -539,7 +541,7 @@
539541
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
540542
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel87'), bool('true'), bool('false'))]",
541543
"dependsOn": [
542-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
544+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
543545
],
544546
"properties": {
545547
"mode": "Incremental",
@@ -558,7 +560,7 @@
558560
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
559561
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel87'), bool('true'), bool('false'))]",
560562
"dependsOn": [
561-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
563+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
562564
],
563565
"properties": {
564566
"mode": "Incremental",
@@ -577,7 +579,7 @@
577579
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
578580
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel87'), bool('true'), bool('false'))]",
579581
"dependsOn": [
580-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
582+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
581583
],
582584
"properties": {
583585
"mode": "Incremental",
@@ -596,7 +598,7 @@
596598
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
597599
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]",
598600
"dependsOn": [
599-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
601+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
600602
],
601603
"properties": {
602604
"mode": "Incremental",
@@ -615,7 +617,7 @@
615617
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
616618
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]",
617619
"dependsOn": [
618-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
620+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
619621
],
620622
"properties": {
621623
"mode": "Incremental",
@@ -634,7 +636,7 @@
634636
"tags": "[funcTags.tagsFilter(parameters('tagsByResource'),'${identifier.resourcesDeployment}')]",
635637
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]",
636638
"dependsOn": [
637-
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('vmName'))]"
639+
"[resourceId('Microsoft.Compute/virtualMachines/', variables('name_vmName'))]"
638640
],
639641
"properties": {
640642
"mode": "Incremental",

0 commit comments

Comments
 (0)