Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
synching portal config with upstream
[oom.git]
/
kubernetes
/
portal
/
templates
/
portal-apps-deployment.yaml
diff --git
a/kubernetes/portal/templates/portal-apps-deployment.yaml
b/kubernetes/portal/templates/portal-apps-deployment.yaml
index
a0818fa
..
c607867
100755
(executable)
--- 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:
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
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
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
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
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
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
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
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
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
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
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
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
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-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
- name: dbcapp-fusion-properties
hostPath:
path: /dockerdata-nfs/{{ .Values.nsPrefix }}/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties