Synching up portal config

-moving container tags to 1.3
-pulling latest docker config mount files
-changing mariadb password back to original. there was no reason to change
in the first place
-robot health check passes:
Basic Portal Health Check        | PASS |

Issue-ID: OOM-340

Change-Id: I77d22b701aa27473a9cfce25031c13f9be845dae
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>

2 files changed, 3 insertions, 11 deletions

diff --git a/kubernetes/portal/templates/portal-apps-deployment.yaml b/kubernetes/portal/templates/portal-apps-deployment.yaml
index 13cf57093d..c9cb645bae 100755
--- a/kubernetes/portal/templates/portal-apps-deployment.yaml
+++ b/kubernetes/portal/templates/portal-apps-deployment.yaml
@@ -38,7 +38,7 @@ spec:
                "name": "portalapps-readiness"
            },
            {
-               "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -ppassword -h portaldb < /portal-mysql/oom_updates.sql; fi"],
+               "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -pAa123456 -h portaldb < /portal-mysql/oom_updates.sql; fi"],
                "volumeMounts": [
                  {
                    "mountPath": "/portal-mysql/oom_updates.sql",
@@ -77,14 +77,6 @@ spec:
           name: portal-portal-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: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/conf/system.properties"
-          name: dbcapp-system-properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/classes/portal.properties"
-          name: dbcapp-portal-properties
-        - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties"
-          name: dbcapp-dbcapp-properties
         - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/conf/system.properties"
           name: sdkapp-system-properties
         - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/classes/portal.properties"
diff --git a/kubernetes/portal/templates/portal-mariadb-deployment.yaml b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
index df38a2abb3..8dc7ebabf3 100755
--- a/kubernetes/portal/templates/portal-mariadb-deployment.yaml
+++ b/kubernetes/portal/templates/portal-mariadb-deployment.yaml
@@ -14,14 +14,14 @@ spec:
       name: portaldb
     spec:
       containers:
-      - image: {{ .Values.image.portaldb}} 
+      - image: {{ .Values.image.portaldb}}
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: "portaldb"
         env:
         - name: MYSQL_HOST
           value: "portaldb.{{ .Values.nsPrefix }}-portal"
         - name: MYSQL_ROOT_PASSWORD
-          value: password
+          value: Aa123456
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime