Skip to content

Commit ef57d19

Browse files
gnsuryangnsuryan
authored
Merge branch 'test' into merge-main-to-test
2 parents 36a6f0b + bc1c91c commit ef57d19

File tree

53 files changed

+669
-638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+669
-638
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@
9292
"resources": [
9393
{
9494
"type": "Microsoft.Resources/deployments",
95-
"apiVersion": "${azure.apiVersion}",
96-
"name": "${post.deploy.ssl.config.start}",
95+
"apiVersion": "2020-06-01",
96+
"name": "post.deploy.ssl.config.start",
9797
"properties": {
9898
"mode": "Incremental",
9999
"template": {
@@ -106,7 +106,7 @@
106106
{
107107
"type": "Microsoft.Compute/virtualMachines/extensions",
108108
"name": "[concat(parameters('adminVMName'),'/newuserscript')]",
109-
"apiVersion": "${azure.apiVersion}",
109+
"apiVersion": "2020-06-01",
110110
"location": "[parameters('location')]",
111111
"properties": {
112112
"publisher": "Microsoft.Azure.Extensions",
@@ -126,8 +126,8 @@
126126
},
127127
{
128128
"type": "Microsoft.Resources/deployments",
129-
"apiVersion": "${azure.apiVersion}",
130-
"name": "${post.deploy.ssl.config.end}",
129+
"apiVersion": "2020-06-01",
130+
"name": "post.deploy.ssl.config.end",
131131
"dependsOn": [
132132
"[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]"
133133
],

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

Lines changed: 35 additions & 35 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"resources": [
6161
{
6262
"type": "Microsoft.Network/dnszones",
63-
"apiVersion": "${azure.apiVersionForDNSZone}",
63+
"apiVersion": "2018-05-01",
6464
"name": "[parameters('dnszoneName')]",
6565
"location": "[parameters('location')]",
6666
"properties": {
@@ -69,7 +69,7 @@
6969
},
7070
{
7171
"type": "Microsoft.Network/dnszones/A",
72-
"apiVersion": "${azure.apiVersionForDNSZone}",
72+
"apiVersion": "2018-05-01",
7373
"condition": "[variables('const_hasARecords')]",
7474
"name": "[concat(parameters('dnszoneName'), '/', variables('const_dnszonesARecordSetNames')[copyIndex()])]",
7575
"copy": {
@@ -88,7 +88,7 @@
8888
},
8989
{
9090
"type": "Microsoft.Network/dnszones/CNAME",
91-
"apiVersion": "${azure.apiVersionForDNSZone}",
91+
"apiVersion": "2018-05-01",
9292
"condition": "[variables('const_hasCNAMERecords')]",
9393
"name": "[concat(parameters('dnszoneName'),'/', variables('const_dnszonesCNAMERecordSetNames')[copyIndex()])]",
9494
"location": "[parameters('location')]",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
"resources": [
111111
{
112112
"type": "Microsoft.Resources/deploymentScripts",
113-
"apiVersion": "${azure.apiVersionForDeploymentScript}",
113+
"apiVersion": "2020-10-01",
114114
"name": "script-createDNSRecords",
115115
"location": "[parameters('location')]",
116116
"identity": "[parameters('identity')]",

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
},
7878
"resources": [
7979
{
80-
"apiVersion": "${azure.apiVersionForKeyVault}",
80+
"apiVersion": "2019-09-01",
8181
"name": "[variables('name_keyVaultName')]",
8282
"location": "[parameters('location')]",
8383
"type": "Microsoft.KeyVault/vaults",
@@ -93,7 +93,7 @@
9393
},
9494
{
9595
"type": "Microsoft.KeyVault/vaults/secrets",
96-
"apiVersion": "${azure.apiVersionForKeyVault}",
96+
"apiVersion": "2019-09-01",
9797
"name": "[concat(variables('name_keyVaultName'), '/', variables('name_customIdentityKeyStoreDataSecretName'))]",
9898
"location": "[parameters('location')]",
9999
"dependsOn": [
@@ -105,7 +105,7 @@
105105
},
106106
{
107107
"type": "Microsoft.KeyVault/vaults/secrets",
108-
"apiVersion": "${azure.apiVersionForKeyVault}",
108+
"apiVersion": "2019-09-01",
109109
"name": "[concat(variables('name_keyVaultName'), '/', variables('name_customIdentityKeyStorePassPhraseSecretName'))]",
110110
"location": "[parameters('location')]",
111111
"dependsOn": [
@@ -117,7 +117,7 @@
117117
},
118118
{
119119
"type": "Microsoft.KeyVault/vaults/secrets",
120-
"apiVersion": "${azure.apiVersionForKeyVault}",
120+
"apiVersion": "2019-09-01",
121121
"name": "[concat(variables('name_keyVaultName'), '/', variables('name_customTrustKeyStoreDataSecretName'))]",
122122
"location": "[parameters('location')]",
123123
"dependsOn": [
@@ -129,7 +129,7 @@
129129
},
130130
{
131131
"type": "Microsoft.KeyVault/vaults/secrets",
132-
"apiVersion": "${azure.apiVersionForKeyVault}",
132+
"apiVersion": "2019-09-01",
133133
"name": "[concat(variables('name_keyVaultName'), '/', variables('name_customTrustKeyStorePassPhraseSecretName'))]",
134134
"location": "[parameters('location')]",
135135
"dependsOn": [
@@ -141,7 +141,7 @@
141141
},
142142
{
143143
"type": "Microsoft.KeyVault/vaults/secrets",
144-
"apiVersion": "${azure.apiVersionForKeyVault}",
144+
"apiVersion": "2019-09-01",
145145
"name": "[concat(variables('name_keyVaultName'), '/', variables('name_privateKeyAliasSecretName'))]",
146146
"location": "[parameters('location')]",
147147
"dependsOn": [
@@ -153,7 +153,7 @@
153153
},
154154
{
155155
"type": "Microsoft.KeyVault/vaults/secrets",
156-
"apiVersion": "${azure.apiVersionForKeyVault}",
156+
"apiVersion": "2019-09-01",
157157
"name": "[concat(variables('name_keyVaultName'), '/', variables('name_privateKeyPassPhraseSecretName'))]",
158158
"location": "[parameters('location')]",
159159
"dependsOn": [

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@
146146
"resources": [
147147
{
148148
"type": "Microsoft.Resources/deployments",
149-
"apiVersion": "${azure.apiVersion}",
150-
"name": "${admin.aad.start}",
149+
"apiVersion": "2020-06-01",
150+
"name": "6245e080-ab9b-5e42-ac14-fc38cc610a11",
151151
"properties": {
152152
"mode": "Incremental",
153153
"template": {
@@ -160,7 +160,7 @@
160160
},
161161
{
162162
"type": "Microsoft.Compute/virtualMachines/extensions",
163-
"apiVersion": "${azure.apiVersion}",
163+
"apiVersion": "2020-06-01",
164164
"name": "[concat(parameters('adminVMName'),'/newuserscript')]",
165165
"location": "[parameters('location')]",
166166
"properties": {
@@ -180,8 +180,8 @@
180180
},
181181
{
182182
"type": "Microsoft.Resources/deployments",
183-
"apiVersion": "${azure.apiVersion}",
184-
"name": "${admin.aad.end}",
183+
"apiVersion": "2020-06-01",
184+
"name": "pid-6449f9a2-0713-5a81-a886-dce6d8d5c137",
185185
"dependsOn": [
186186
"[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]"
187187
],

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

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@
194194
"resources": [
195195
{
196196
"type": "Microsoft.Resources/deployments",
197-
"apiVersion": "${azure.apiVersion}",
198-
"name": "${admin.admin.start}",
197+
"apiVersion": "2020-06-01",
198+
"name": "pid-88e1c590-988c-51bb-bbd3-4929629bfb9c",
199199
"properties": {
200200
"mode": "Incremental",
201201
"template": {
@@ -208,7 +208,7 @@
208208
},
209209
{
210210
"type": "Microsoft.Network/networkSecurityGroups",
211-
"apiVersion": "${azure.apiVersion}",
211+
"apiVersion": "2020-06-01",
212212
"name": "[variables('name_networkSecurityGroup')]",
213213
"location": "[parameters('location')]",
214214
"properties": {
@@ -257,7 +257,7 @@
257257
},
258258
{
259259
"type": "Microsoft.Storage/storageAccounts",
260-
"apiVersion": "${azure.apiVersion2}",
260+
"apiVersion": "2019-06-01",
261261
"name": "[variables('name_storageAccount')]",
262262
"location": "[parameters('location')]",
263263
"sku": {
@@ -273,7 +273,7 @@
273273
},
274274
{
275275
"type": "Microsoft.Storage/storageAccounts/fileServices",
276-
"apiVersion": "${azure.apiVersion2}",
276+
"apiVersion": "2019-06-01",
277277
"name": "[concat(variables('name_storageAccount'), '/default')]",
278278
"dependsOn": [
279279
"[variables('ref_storage')]"
@@ -285,7 +285,7 @@
285285
},
286286
{
287287
"type": "Microsoft.Storage/storageAccounts/fileServices/shares",
288-
"apiVersion": "${azure.apiVersion2}",
288+
"apiVersion": "2019-06-01",
289289
"name": "[concat(variables('name_storageAccount'), '/default/', variables('name_share'))]",
290290
"dependsOn": [
291291
"[variables('ref_fileService')]",
@@ -297,7 +297,7 @@
297297
},
298298
{
299299
"type": "Microsoft.Network/publicIPAddresses",
300-
"apiVersion": "${azure.apiVersion}",
300+
"apiVersion": "2020-06-01",
301301
"name": "[variables('name_publicIPAddress')]",
302302
"location": "[parameters('location')]",
303303
"properties": {
@@ -309,7 +309,7 @@
309309
},
310310
{
311311
"type": "Microsoft.Network/virtualNetworks",
312-
"apiVersion": "${azure.apiVersion}",
312+
"apiVersion": "2020-06-01",
313313
"name": "[variables('name_virtualNetwork')]",
314314
"location": "[parameters('location')]",
315315
"dependsOn": [
@@ -336,7 +336,7 @@
336336
},
337337
{
338338
"type": "Microsoft.Network/networkInterfaces",
339-
"apiVersion": "${azure.apiVersion}",
339+
"apiVersion": "2020-06-01",
340340
"name": "[variables('name_nic')]",
341341
"location": "[parameters('location')]",
342342
"dependsOn": [
@@ -365,7 +365,7 @@
365365
},
366366
{
367367
"type": "Microsoft.Compute/virtualMachines",
368-
"apiVersion": "${azure.apiVersion}",
368+
"apiVersion": "2020-06-01",
369369
"name": "[parameters('adminVMName')]",
370370
"location": "[parameters('location')]",
371371
"dependsOn": [
@@ -407,7 +407,7 @@
407407
"diagnosticsProfile": {
408408
"bootDiagnostics": {
409409
"enabled": true,
410-
"storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '${azure.apiVersion2}').primaryEndpoints.blob]"
410+
"storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts/', variables('name_storageAccount')), '2019-06-01').primaryEndpoints.blob]"
411411
}
412412
}
413413
},
@@ -420,7 +420,7 @@
420420
{
421421
"name": "[concat(parameters('adminVMName'),'/newuserscript')]",
422422
"type": "Microsoft.Compute/virtualMachines/extensions",
423-
"apiVersion": "${azure.apiVersion}",
423+
"apiVersion": "2020-06-01",
424424
"location": "[parameters('location')]",
425425
"dependsOn": [
426426
"[resourceId('Microsoft.Compute/virtualMachines/', parameters('adminVMName'))]",
@@ -437,14 +437,14 @@
437437
]
438438
},
439439
"protectedSettings": {
440-
"commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '${azure.apiVersion2}').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ', if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn), '\"')]"
440+
"commandToExecute": "[concat('sh',' ',variables('name_scriptFile'),' <<< \"',parameters('wlsDomainName'),' ',parameters('wlsUserName'),' ',parameters('wlsPassword'),' ',parameters('adminVMName'),' ', variables('const_wlsHome'),' ',variables('name_storageAccount'),' ',listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('name_storageAccount')), '2019-06-01').keys[0].value,' ',variables('const_mountPointPath'),' ',string(parameters('enableHTTPAdminListenPort')),' ', if(parameters('enableCustomDNS'), parameters('customDNSName'), reference(variables('name_publicIPAddress')).dnsSettings.fqdn), '\"')]"
441441
}
442442
}
443443
},
444444
{
445445
"type": "Microsoft.Resources/deployments",
446-
"apiVersion": "${azure.apiVersion}",
447-
"name": "${admin.admin.end}",
446+
"apiVersion": "2020-06-01",
447+
"name": "admin.admin.end",
448448
"dependsOn": [
449449
"[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]"
450450
],
@@ -460,8 +460,8 @@
460460
},
461461
{
462462
"type": "Microsoft.Resources/deployments",
463-
"apiVersion": "${azure.apiVersion}",
464-
"name": "${from.owls-122130-jdk8-ol74}",
463+
"apiVersion": "2020-06-01",
464+
"name": "pid-caa3ea2b-cdec-55ee-8510-854ed10d7ebe",
465465
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122130-jdk8-ol74'), bool('true'), bool('false'))]",
466466
"dependsOn": [
467467
"[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]"
@@ -478,8 +478,8 @@
478478
},
479479
{
480480
"type": "Microsoft.Resources/deployments",
481-
"apiVersion": "${azure.apiVersion}",
482-
"name": "${from.owls-122130-jdk8-ol73}",
481+
"apiVersion": "2020-06-01",
482+
"name": "pid-bf1d0f1a-cb9a-5453-bf70-42b4efe8c15e",
483483
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122130-jdk8-ol73'), bool('true'), bool('false'))]",
484484
"dependsOn": [
485485
"[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]"
@@ -496,8 +496,8 @@
496496
},
497497
{
498498
"type": "Microsoft.Resources/deployments",
499-
"apiVersion": "${azure.apiVersion}",
500-
"name": "${from.owls-122140-jdk8-ol76}",
499+
"apiVersion": "2020-06-01",
500+
"name": "pid-bde756bb-ce96-54d5-a478-04d9bd87e9db",
501501
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'from.owls-122140-jdk8-ol76'), bool('true'), bool('false'))]",
502502
"dependsOn": [
503503
"[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]"
@@ -514,8 +514,8 @@
514514
},
515515
{
516516
"type": "Microsoft.Resources/deployments",
517-
"apiVersion": "${azure.apiVersion}",
518-
"name": "${from.owls-141100-jdk8-ol76}",
517+
"apiVersion": "2020-06-01",
518+
"name": "pid-b6f00a34-1478-5a10-9a84-49c4051b57b8",
519519
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-ol76'), bool('true'), bool('false'))]",
520520
"dependsOn": [
521521
"[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]"
@@ -532,8 +532,8 @@
532532
},
533533
{
534534
"type": "Microsoft.Resources/deployments",
535-
"apiVersion": "${azure.apiVersion}",
536-
"name": "${from.owls-141100-jdk11-ol76}",
535+
"apiVersion": "2020-06-01",
536+
"name": "pid-afc8f9c5-8c5d-5d1b-ab4d-3116ca908bfd",
537537
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-ol76'), bool('true'), bool('false'))]",
538538
"dependsOn": [
539539
"[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]"
@@ -550,8 +550,8 @@
550550
},
551551
{
552552
"type": "Microsoft.Resources/deployments",
553-
"apiVersion": "${azure.apiVersion}",
554-
"name": "${from.owls-122140-jdk8-rhel76}",
553+
"apiVersion": "2020-06-01",
554+
"name": "0a52f317-8b40-4a77-9f3c-7607fc3ebfb7wls",
555555
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-122140-jdk8-rhel76'), bool('true'), bool('false'))]",
556556
"dependsOn": [
557557
"[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]"
@@ -568,8 +568,8 @@
568568
},
569569
{
570570
"type": "Microsoft.Resources/deployments",
571-
"apiVersion": "${azure.apiVersion}",
572-
"name": "${from.owls-141100-jdk8-rhel76}",
571+
"apiVersion": "2020-06-01",
572+
"name": "26ec5cf5-dd84-4764-97cf-4f830facbf66wls",
573573
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk8-rhel76'), bool('true'), bool('false'))]",
574574
"dependsOn": [
575575
"[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]"
@@ -586,8 +586,8 @@
586586
},
587587
{
588588
"type": "Microsoft.Resources/deployments",
589-
"apiVersion": "${azure.apiVersion}",
590-
"name": "${from.owls-141100-jdk11-rhel76}",
589+
"apiVersion": "2020-06-01",
590+
"name": "ada2e3e6-faef-4339-aaac-40bcdc4484ecwls",
591591
"condition": "[if(contains(variables('name_linuxImageOfferSKU'), 'owls-141100-jdk11-rhel76'), bool('true'), bool('false'))]",
592592
"dependsOn": [
593593
"[resourceId('Microsoft.Compute/virtualMachines/extensions', parameters('adminVMName'), 'newuserscript')]"

0 commit comments

Comments
 (0)