Merge "ONAP Portal 1.1 work"

1 files changed, 24 insertions, 14 deletions

diff --git a/kubernetes/portal/portal-apps-deployment.yaml b/kubernetes/portal/portal-apps-deployment.yaml
index 39f32caa47..c9ed3e7a6a 100755
--- a/kubernetes/portal/portal-apps-deployment.yaml
+++ b/kubernetes/portal/portal-apps-deployment.yaml
@@ -37,10 +37,10 @@ spec:
                "name": "portalapps-readiness"
            },
            {
-               "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -ppassword -h portaldb < /portal-mysql/Apps_Users_OnBoarding_Script.sql; fi"],
+               "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -ppassword -h portaldb < /portal-mysql/oom_updates.sql; fi"],
                "volumeMounts": [
                  {
-                   "mountPath": "/portal-mysql/Apps_Users_OnBoarding_Script.sql",
+                   "mountPath": "/portal-mysql/oom_updates.sql",
                    "name": "portal-mariadb-onboarding-sql"
                  },
                  {
@@ -55,35 +55,39 @@ spec:
            ]'
     spec:
       containers:
-      - image: nexus3.onap.org:10001/openecomp/portalapps:1.0-STAGING-latest
+      - image: nexus3.onap.org:10001/openecomp/portalapps:1.1-STAGING-latest
         lifecycle:
           postStart:
             exec:
               command: ["/bin/sh", "-c", "echo yes > /portal_root/boot.txt"]
         name: portalapps
         volumeMounts:
-        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP/WEB-INF/fusion/conf/fusion.properties
+        - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/fusion/conf/fusion.properties
           name: portal-fusion-properties
-        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP/WEB-INF/classes/openid-connect.properties
+        - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/classes/openid-connect.properties
           name: portal-openid-connect-properties
-        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP/WEB-INF/conf/system.properties
+        - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/conf/system.properties
           name: portal-system-properties
-        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPPORTALAPP/WEB-INF/classes/portal.properties
+        - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPPORTAL/WEB-INF/classes/portal.properties
           name: portal-portal-properties
-        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPDBCAPP/WEB-INF/fusion/fusion.properties
+        - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/fusion/conf/fusion.properties
           name: dbcapp-fusion-properties
-        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPDBCAPP/WEB-INF/conf/system.properties
+        - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/conf/system.properties
           name: dbcapp-system-properties
-        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPDBCAPP/WEB-INF/classes/portal.properties
+        - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/classes/portal.properties
           name: dbcapp-portal-properties
-        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties
+        - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties
           name: dbcapp-dbcapp-properties
-        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPSDKAPP/WEB-INF/conf/system.properties
+        - mountPath: /opt/apache-tomcat-8.0.37/webapps/ECOMPSDKAPP/WEB-INF/conf/system.properties
           name: sdkapp-system-properties
-        - mountPath: /PROJECT/APPS/ECOMPPORTAL/ECOMPSDKAPP/WEB-INF/classes/portal.properties
+        - mountPath: /opt/apache-tomcat-8.0.37/webapps/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
+          name: sdkapp-fusion-properties
         - mountPath: /portal_root/
           name: portal-root
+        - mountPath: /opt/apache-tomcat-8.0.37/logs
+          name: portal-logs
         ports:
         - containerPort: 8005
         - containerPort: 8009
@@ -124,11 +128,17 @@ spec:
         - name: sdkapp-portal-properties
           hostPath:
             path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
+        - name: sdkapp-fusion-properties
+          hostPath:
+            path: /dockerdata-nfs/onapdemo/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties            
         - name: portal-mariadb-onboarding-sql
           hostPath:
-            path: /dockerdata-nfs/onapdemo/portal/mariadb/Apps_Users_OnBoarding_Script.sql
+            path: /dockerdata-nfs/onapdemo/portal/mariadb/oom_updates.sql
         - name: portal-root
           hostPath:
             path: /dockerdata-nfs/onapdemo/portal
+        - name: portal-logs
+          hostPath:
+            path: /dockerdata-nfs/onapdemo/portal/logs
       imagePullSecrets:
       - name: onap-docker-registry-key