aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/portal
diff options
context:
space:
mode:
authorMandeep Khinda <mandeep.khinda@amdocs.com>2017-09-11 20:12:08 +0000
committerMandeep Khinda <mandeep.khinda@amdocs.com>2017-09-11 21:04:54 +0000
commitf8bda5c9ee1b5a0519fa5e7faa0fdd5b889e4e85 (patch)
treea1d5192ec968b2406d8d9961884bf014e47df455 /kubernetes/portal
parenta52f1b5dc7230816f8799fa044d8d3bbc7fb0bce (diff)
synching portal config with upstream
on master branch there were changes to portals vm_init script and docker-compose process that needed to be ported to oom. src of config are on master in portal/deliveries/ reverted the docker image name changes. upstream master has introuced a "-" between apps, db and wms. these images were cauing NPEs during portal spring boot so went back to original image names until further notice. Issue-ID: OOM-276 Change-Id: I708628f4b375325f2f2b753d1a374699b763098a Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Diffstat (limited to 'kubernetes/portal')
-rwxr-xr-xkubernetes/portal/templates/portal-apps-deployment.yaml29
-rw-r--r--kubernetes/portal/values.yaml2
2 files changed, 19 insertions, 12 deletions
diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
index a0818fab1b..c6078678cd 100755
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -64,31 +64,33 @@ spec:
command: ["/bin/sh", "-c", "echo yes > /portal_root/boot.txt"]
name: portalapps
volumeMounts:
- - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/fusion/conf/fusion.properties
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/fusion/conf/fusion.properties"
name: portal-fusion-properties
- - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/classes/openid-connect.properties
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/classes/openid-connect.properties"
name: portal-openid-connect-properties
- - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/conf/system.properties
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/conf/system.properties"
name: portal-system-properties
- - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/classes/portal.properties
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/classes/portal.properties"
name: portal-portal-properties
- - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/fusion/conf/fusion.properties
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/classes/logback.xml"
+ name: portal-logback
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/fusion/conf/fusion.properties"
name: dbcapp-fusion-properties
- - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/conf/system.properties
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/conf/system.properties"
name: dbcapp-system-properties
- - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/classes/portal.properties
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/classes/portal.properties"
name: dbcapp-portal-properties
- - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties"
name: dbcapp-dbcapp-properties
- - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPSDKAPP/WEB-INF/conf/system.properties
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/conf/system.properties"
name: sdkapp-system-properties
- - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPSDKAPP/WEB-INF/classes/portal.properties
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/classes/portal.properties"
name: sdkapp-portal-properties
- - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPSDKAPP/WEB-INF/fusion/conf/fusion.properties
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/fusion/conf/fusion.properties"
name: sdkapp-fusion-properties
- mountPath: /portal_root/
name: portal-root
- - mountPath: /opt/apache-tomcat-8.0.37/logs
+ - mountPath: "{{ .Values.onapPortal.webappsDir }}/logs"
name: portal-logs
ports:
- containerPort: 8005
@@ -112,6 +114,9 @@ spec:
- name: portal-portal-properties
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties
+ - name: portal-logback
+ hostPath:
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml
- name: dbcapp-fusion-properties
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties
diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index f4d1919904..da851e02c2 100644
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -9,3 +9,5 @@ image:
portalwms: nexus3.onap.org:10001/openecomp/portalwms:1.1-STAGING-latest
ubuntuInit: oomk8s/ubuntu-init:1.0.0
ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc
+onapPortal:
+ webappsDir: "/opt/apache-tomcat-8.0.37/webapps" \ No newline at end of file