summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdnc/resources/config/conf/setenv
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-09-14 11:57:55 -0400
committerDan Timoney <dtimoney@att.com>2020-09-21 15:45:25 +0000
commita98765b504f848e0945f367b7da7b7bdeaefa9ad (patch)
tree55009c2fb53e295f27eb3d85ec10de4586dd1436 /kubernetes/sdnc/resources/config/conf/setenv
parent1d7d0e2834531a278b0c3af57ce4cc6e2b62b3ee (diff)
[SDNC/CCSDK] Guilin version bump
Bump image versions to use Guilin M4 version of SDNC images and of CCSDK dgbuilder. Note - SDNR remains disabled in this commit pending fix to its endpoint. Also, note that CDS version bump is not included - that will be submitted as a separate review. Issue-ID: SDNC-1355 Signed-off-by: Dan Timoney <dtimoney@att.com> Change-Id: I8d660a8e303a18d4674f832b9239fa50c5abf3f2
Diffstat (limited to 'kubernetes/sdnc/resources/config/conf/setenv')
-rw-r--r--kubernetes/sdnc/resources/config/conf/setenv10
1 files changed, 5 insertions, 5 deletions
diff --git a/kubernetes/sdnc/resources/config/conf/setenv b/kubernetes/sdnc/resources/config/conf/setenv
index 7476e6849a..52c9ff76b4 100644
--- a/kubernetes/sdnc/resources/config/conf/setenv
+++ b/kubernetes/sdnc/resources/config/conf/setenv
@@ -54,8 +54,8 @@ if [ "x$JAVA_MAX_MEM" = "x" ]; then
export JAVA_MAX_MEM="2048m"
fi
-EXTRA_JAVA_OPTS: "-XX:+UseG1GC -XX:MaxGCPauseMillis={{.Values.config.odl.javaOptions.maxGCPauseMillis}} \
- -XX:ParallelGCThreads={{.Values.config.odl.javaOptions.parallelGCThreads}} -XX:+ParallelRefProcEnabled \
- -XX:+UseStringDeduplication -XX:+PrintGC -XX:+PrintGCDateStamps -XX:+PrintGCDetails \
- -XX:+PrintGCTimeStamps -XX:+UseGCLogFileRotation \
- -XX:NumberOfGCLogFiles={{.Values.config.odl.javaOptions.numberGGLogFiles}} -Xloggc:/var/log/onap/sdnc/gc-%t.log"
+EXTRA_JAVA_OPTS=${EXTRA_JAVA_OPTS:-"-XX:+UseG1GC \
+ -XX:MaxGCPauseMillis={{.Values.config.odl.javaOptions.maxGCPauseMillis}} \
+ -XX:ParallelGCThreads={{.Values.config.odl.javaOptions.parallelGCThreads}} \
+ -XX:+ParallelRefProcEnabled \
+ -XX:+UseStringDeduplication {{.Values.config.odl.javaOptions.gcLogOptions}}"}