From: Brian Freeman <bf1936@att.com>
Date: Tue, 10 Sep 2019 21:43:00 +0000 (+0000)
Subject: Merge "Update tomcat to 8.5"
X-Git-Tag: 5.0.1-ONAP~78
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=2d6a72dd915a62eb86e29faf8706af57460973ab;hp=7edc7992a9a16fdd61b500045b24a025f505d2f4;p=oom.git

Merge "Update tomcat to 8.5"
---

diff --git a/kubernetes/portal/charts/portal-app/templates/deployment.yaml b/kubernetes/portal/charts/portal-app/templates/deployment.yaml
index 5503328df4..dc27fdb6db 100644
--- a/kubernetes/portal/charts/portal-app/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-app/templates/deployment.yaml
@@ -55,6 +55,8 @@ spec:
           - ""
           - -n
           - ""
+          - -b
+          - "{{ .Values.global.env.tomcatDir }}"
         env:
           - name: CATALINA_OPTS
             value: >
diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index f8eccf7b27..9dbdd7cfd9 100644
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -15,7 +15,7 @@
 
 global:
   env:
-    tomcatDir: "/opt/apache-tomcat-8.0.37"
+    tomcatDir: "/usr/local/tomcat"
   # portal frontend port
   portalPort: "8989"
   portalFEPort: "30225"