Skip to content

Commit 85b479e

Browse files
gnsuryangnsuryan
committed
Merge branch 'main' of https://github.com/gnsuryan/weblogic-azure into main
2 parents fc65687 + 8945955 commit 85b479e

File tree

8 files changed

+83
-34
lines changed

8 files changed

+83
-34
lines changed

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/admin-ssl-post-deploy/src/main/scripts/configureCustomAdminSSL.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ if isCustomSSLEnabled == 'true' :
127127
cmo.setHostnameVerificationIgnored(true)
128128
129129
cd('/Servers/$wlsServerName/ServerStart/$wlsServerName')
130-
arguments = '-Dweblogic.Name=$wlsServerName -Dweblogic.security.SSL.ignoreHostnameVerification=true'
130+
arguments = '${SERVER_STARTUP_ARGS} -Dweblogic.Name=$wlsServerName -Dweblogic.security.SSL.ignoreHostnameVerification=true'
131131
oldArgs = cmo.getArguments()
132-
if oldArgs != None:
133-
newArgs = oldArgs + ' ' + arguments;
134-
else:
135-
newArgs = arguments
132+
if oldArgs != None:
133+
newArgs = oldArgs + ' ' + arguments
134+
else:
135+
newArgs = arguments
136136
cmo.setArguments(newArgs)
137137
save()
138138
resolve()
@@ -305,6 +305,7 @@ username="oracle"
305305
groupname="oracle"
306306

307307
KEYSTORE_PATH="$wlsDomainPath/$wlsDomainName/keystores"
308+
SERVER_STARTUP_ARGS="-Dlog4j2.formatMsgNoLookups=true"
308309

309310
validateInput
310311
cleanup

‎weblogic-azure-vm/arm-oraclelinux-wls-admin/src/main/scripts/setupAdminDomain.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ Wants=network-online.target
226226
[Service]
227227
Type=simple
228228
WorkingDirectory="/u01/domains/$wlsDomainName"
229+
Environment="JAVA_OPTIONS=${SERVER_STARTUP_ARGS}"
229230
ExecStart="${startWebLogicScript}"
230231
ExecStop="${stopWebLogicScript}"
231232
User=oracle

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/addnode/src/main/scripts/addnode.sh‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -260,12 +260,12 @@ if isCustomSSLEnabled == 'true' :
260260
cmo.setHostnameVerificationIgnored(true)
261261
262262
cd('/Servers/$wlsServerName/ServerStart/$wlsServerName')
263-
arguments = '-Dweblogic.Name=$wlsServerName -Dweblogic.security.SSL.ignoreHostnameVerification=true'
263+
arguments = '${SERVER_STARTUP_ARGS} -Dweblogic.Name=$wlsServerName -Dweblogic.security.SSL.ignoreHostnameVerification=true'
264264
oldArgs = cmo.getArguments()
265-
if oldArgs != None:
266-
newArgs = oldArgs + ' ' + arguments;
267-
else:
268-
newArgs = arguments
265+
if oldArgs != None:
266+
newArgs = oldArgs + ' ' + arguments
267+
else:
268+
newArgs = arguments
269269
cmo.setArguments(newArgs)
270270
EOF
271271

@@ -341,10 +341,10 @@ EOF
341341
cat <<EOF >>$wlsDomainPath/add-server.py
342342
cd('/Servers/$wlsServerName//ServerStart/$wlsServerName')
343343
oldArgs = cmo.getArguments()
344-
if oldArgs != None:
345-
newArgs = oldArgs + ' ' + arguments;
346-
else:
347-
newArgs = arguments
344+
if oldArgs != None:
345+
newArgs = oldArgs + ' ' + arguments
346+
else:
347+
newArgs = arguments
348348
cmo.setArguments(newArgs)
349349
save()
350350
resolve()
@@ -419,6 +419,7 @@ Type=simple
419419
# Note that the following three parameters should be changed to the correct paths
420420
# on your own system
421421
WorkingDirectory="$wlsDomainPath/$wlsDomainName"
422+
Environment="JAVA_OPTIONS=${SERVER_STARTUP_ARGS}"
422423
ExecStart="$wlsDomainPath/$wlsDomainName/bin/startNodeManager.sh"
423424
ExecStop="$wlsDomainPath/$wlsDomainName/bin/stopNodeManager.sh"
424425
User=oracle

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupClusterDomain.sh‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -313,12 +313,12 @@ set('ServerPrivateKeyPassPhrase', '$serverPrivateKeyPassPhrase')
313313
cmo.setHostnameVerificationIgnored(true)
314314
315315
cd('/Servers/$wlsServerName//ServerStart/$wlsServerName')
316-
arguments = '-Dweblogic.Name=$wlsServerName -Dweblogic.management.server=${SERVER_START_URL} -Dweblogic.security.SSL.ignoreHostnameVerification=true'
316+
arguments = '${SERVER_STARTUP_ARGS} -Dweblogic.Name=$wlsServerName -Dweblogic.management.server=${SERVER_START_URL} -Dweblogic.security.SSL.ignoreHostnameVerification=true'
317317
oldArgs = cmo.getArguments()
318-
if oldArgs != None:
319-
newArgs = oldArgs + ' ' + arguments;
320-
else:
321-
newArgs = arguments
318+
if oldArgs != None:
319+
newArgs = oldArgs + ' ' + arguments
320+
else:
321+
newArgs = arguments
322322
cmo.setArguments(newArgs)
323323
save()
324324
resolve()
@@ -438,6 +438,7 @@ Type=simple
438438
# Note that the following three parameters should be changed to the correct paths
439439
# on your own system
440440
WorkingDirectory="$DOMAIN_PATH/$wlsDomainName"
441+
Environment="JAVA_OPTIONS=${SERVER_STARTUP_ARGS}"
441442
ExecStart="$DOMAIN_PATH/$wlsDomainName/bin/startNodeManager.sh"
442443
ExecStop="$DOMAIN_PATH/$wlsDomainName/bin/stopNodeManager.sh"
443444
User=oracle
@@ -466,6 +467,7 @@ Wants=network-online.target
466467
[Service]
467468
Type=simple
468469
WorkingDirectory="$DOMAIN_PATH/$wlsDomainName"
470+
Environment="JAVA_OPTIONS=${SERVER_STARTUP_ARGS}"
469471
ExecStart="${startWebLogicScript}"
470472
ExecStop="${stopWebLogicScript}"
471473
User=oracle

‎weblogic-azure-vm/arm-oraclelinux-wls-cluster/arm-oraclelinux-wls-cluster/src/main/scripts/setupCoherence.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -300,12 +300,12 @@ set('ServerPrivateKeyPassPhrase', '$serverPrivateKeyPassPhrase')
300300
cmo.setHostnameVerificationIgnored(true)
301301
302302
cd('/Servers/$wlsServerName/ServerStart/$wlsServerName')
303-
arguments = '-Dweblogic.Name=$wlsServerName -Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.management.server=http://$wlsAdminURL ${wlsCoherenceArgs}'
303+
arguments = '${SERVER_STARTUP_ARGS} -Dweblogic.Name=$wlsServerName -Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.management.server=http://$wlsAdminURL ${wlsCoherenceArgs}'
304304
oldArgs = cmo.getArguments()
305-
if oldArgs != None:
306-
newArgs = oldArgs + ' ' + arguments;
307-
else:
308-
newArgs = arguments
305+
if oldArgs != None:
306+
newArgs = oldArgs + ' ' + arguments
307+
else:
308+
newArgs = arguments
309309
cmo.setArguments(newArgs)
310310
save()
311311
resolve()
@@ -377,6 +377,7 @@ Type=simple
377377
# Note that the following three parameters should be changed to the correct paths
378378
# on your own system
379379
WorkingDirectory="$wlsDomainPath/$wlsDomainName"
380+
Environment="JAVA_OPTIONS=${SERVER_STARTUP_ARGS}"
380381
ExecStart="$wlsDomainPath/$wlsDomainName/bin/startNodeManager.sh"
381382
ExecStop="$wlsDomainPath/$wlsDomainName/bin/stopNodeManager.sh"
382383
User=oracle

‎weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/addnode/src/main/scripts/addNodeToDynamicCluster.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,6 +401,7 @@ Type=simple
401401
# Note that the following three parameters should be changed to the correct paths
402402
# on your own system
403403
WorkingDirectory="$wlsDomainPath/$wlsDomainName"
404+
Environment="JAVA_OPTIONS=${SERVER_STARTUP_ARGS}"
404405
ExecStart="$wlsDomainPath/$wlsDomainName/bin/startNodeManager.sh"
405406
ExecStop="$wlsDomainPath/$wlsDomainName/bin/stopNodeManager.sh"
406407
User=oracle

‎weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupCoherence.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -311,12 +311,12 @@ set('ServerPrivateKeyPassPhrase', '$serverPrivateKeyPassPhrase')
311311
cmo.setHostnameVerificationIgnored(true)
312312
313313
cd('/Servers/$wlsServerName//ServerStart/$wlsServerName')
314-
arguments = '-Dweblogic.Name=$wlsServerName -Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.management.server=http://$wlsAdminURL ${wlsCoherenceUnicastPortRange}'
314+
arguments = '${SERVER_STARTUP_ARGS} -Dweblogic.Name=$wlsServerName -Dweblogic.security.SSL.ignoreHostnameVerification=true -Dweblogic.management.server=http://$wlsAdminURL ${wlsCoherenceUnicastPortRange}'
315315
oldArgs = cmo.getArguments()
316-
if oldArgs != None:
317-
newArgs = oldArgs + ' ' + arguments;
318-
else:
319-
newArgs = arguments
316+
if oldArgs != None:
317+
newArgs = oldArgs + ' ' + arguments
318+
else:
319+
newArgs = arguments
320320
cmo.setArguments(newArgs)
321321
save()
322322
resolve()
@@ -388,6 +388,7 @@ Type=simple
388388
# Note that the following three parameters should be changed to the correct paths
389389
# on your own system
390390
WorkingDirectory="$wlsDomainPath/$wlsDomainName"
391+
Environment="JAVA_OPTIONS=${SERVER_STARTUP_ARGS}"
391392
ExecStart="$wlsDomainPath/$wlsDomainName/bin/startNodeManager.sh"
392393
ExecStop="$wlsDomainPath/$wlsDomainName/bin/stopNodeManager.sh"
393394
User=oracle
@@ -659,7 +660,6 @@ else
659660
installUtilities
660661
mountFileShare
661662
openPortsForCoherence
662-
updateNetworkRules
663663
storeCustomSSLCerts
664664
createManagedSetup
665665
createNodeManagerService

‎weblogic-azure-vm/arm-oraclelinux-wls-dynamic-cluster/arm-oraclelinux-wls-dynamic-cluster/src/main/scripts/setupDynamicClusterDomain.sh‎

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,6 @@ EOF
200200
'${dynamicServerTemplate}' :
201201
ListenPort: ${wlsManagedPort}
202202
Cluster: '${wlsClusterName}'
203-
ServerStart:
204-
Arguments: '${SERVER_STARTUP_ARGS}'
205203
SSL:
206204
HostnameVerificationIgnored: true
207205
HostnameVerifier: 'None'
@@ -267,8 +265,6 @@ topology:
267265
'${dynamicServerTemplate}':
268266
ListenPort: ${wlsManagedPort}
269267
Cluster: '${wlsClusterName}'
270-
ServerStart:
271-
Arguments: '${SERVER_STARTUP_ARGS}'
272268
SSL:
273269
HostnameVerificationIgnored: true
274270
HostnameVerifier: 'None'
@@ -350,6 +346,38 @@ disconnect()
350346
EOF
351347
}
352348
349+
350+
#This function sets the server startup arguments to dynamic server template
351+
function createServerStartArgumentPyScript()
352+
{
353+
354+
# Exclusive lock is used for startEdit, without that intermittently it is noticed that deployment fails
355+
# Refer issue https://github.com/wls-eng/arm-oraclelinux-wls/issues/280
356+
357+
echo "setting server startup arguments for Dynamic Server Template: ${wlsServerTemplate}"
358+
cat <<EOF >$DOMAIN_PATH/setServerStartArgs.py
359+
connect('$wlsUserName','$wlsPassword','t3://$wlsAdminURL')
360+
361+
try:
362+
edit()
363+
startEdit(60000,60000,'true')
364+
cd('/ServerTemplates/${wlsServerTemplate}/ServerStart/${wlsServerTemplate}')
365+
arguments = cmo.getArguments()
366+
if(str(arguments) == 'None'):
367+
arguments = '${SERVER_STARTUP_ARGS}'
368+
elif ( '${SERVER_STARTUP_ARGS}' not in str(arguments)):
369+
arguments = str(arguments) + ' ' + '${SERVER_STARTUP_ARGS}'
370+
371+
cmo.setArguments(arguments)
372+
save()
373+
activate()
374+
except Exception, e:
375+
print e
376+
377+
disconnect()
378+
EOF
379+
}
380+
353381
#This function creates py Script to enroll Node Manager to the Domain
354382
function createEnrollServerPyScript()
355383
{
@@ -490,6 +518,7 @@ function create_managedSetup(){
490518
491519
echo "Creating managed server model files"
492520
create_managed_model
521+
createServerStartArgumentPyScript
493522
createMachinePyScript
494523
createEnrollServerPyScript
495524
echo "Completed managed server model files"
@@ -515,6 +544,14 @@ function create_managedSetup(){
515544
echo "Error : Adding server $wlsServerName failed"
516545
exit 1
517546
fi
547+
548+
echo "Setting Server Startup Arguments for Dynamic Server Template: ${wlsServerTemplate} "
549+
runuser -l oracle -c ". $oracleHome/oracle_common/common/bin/setWlstEnv.sh; java $WLST_ARGS weblogic.WLST $DOMAIN_PATH/setServerStartArgs.py"
550+
if [[ $? != 0 ]]; then
551+
echo "Error : Adding server startup arguments to Server Template: ${wlsServerTemplate} failed"
552+
exit 1
553+
fi
554+
518555
}
519556
520557
# Create systemctl service for nodemanager
@@ -558,6 +595,7 @@ Type=simple
558595
# Note that the following three parameters should be changed to the correct paths
559596
# on your own system
560597
WorkingDirectory="$DOMAIN_PATH/$wlsDomainName"
598+
Environment="JAVA_OPTIONS=${SERVER_STARTUP_ARGS}"
561599
ExecStart="$DOMAIN_PATH/$wlsDomainName/bin/startNodeManager.sh"
562600
ExecStop="$DOMAIN_PATH/$wlsDomainName/bin/stopNodeManager.sh"
563601
User=oracle
@@ -586,6 +624,7 @@ Wants=network-online.target
586624
[Service]
587625
Type=simple
588626
WorkingDirectory="$DOMAIN_PATH/$wlsDomainName"
627+
Environment="JAVA_OPTIONS=${SERVER_STARTUP_ARGS}"
589628
ExecStart="${startWebLogicScript}"
590629
ExecStop="${stopWebLogicScript}"
591630
User=oracle
@@ -841,6 +880,9 @@ wlsManagedPort=8001
841880
wlsAdminURL="$adminVMName:$wlsAdminT3ChannelPort"
842881
SERVER_START_URL="http://$wlsAdminURL"
843882
KEYSTORE_PATH="${DOMAIN_PATH}/${wlsDomainName}/keystores"
883+
wlsServerTemplate="myServerTemplate"
884+
SERVER_STARTUP_ARGS="-Dlog4j2.formatMsgNoLookups=true"
885+
844886
845887
if [ "${isCustomSSLEnabled}" == "true" ];
846888
then

0 commit comments

Comments
 (0)