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>

15 files changed, 121 insertions, 237 deletions

diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties
deleted file mode 100755
index 7415363e4e..0000000000
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/dbcapp.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# Properties for the Data Bus Controller webapp
-dmaap.rest.url.list = http://dcae-collector-dmaapbc:18080/webapi 
-# webapp's mechid is sent to DCAE for authorization
-dmaap.mechid.name = m06672@dbcapp.dmaap.dcae.att.com
-# encrypted with CipherUtil
-dmaap.mechid.password = /F1vRhga1Ijw7yRFFj6R5A==
-# Valid access methods are "dao" and "rest"
-profile.access.method = dao
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties
deleted file mode 100755
index d49d602376..0000000000
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/fusion.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-# login settings
-login_method_backdoor       = backdoor
-login_method_attribute_name = login_method
-login_method_csp            = csp
-login_method_web_junction   = web_junction
-
-#login message
-login.error.hrid.empty = Login failed, please contact system administrator. 
-login.error.hrid.not-found = User not found, please contact system administrator.
-login.error.user.inactive = Account is disabled, please contact system administrator.
-
-authentication_mechanism = DBAUTH
-
-user_attribute_name      = user
-
-# User Session settings
-roles_attribute_name          = roles
-role_functions_attribute_name = role_functions
-
-# POST settings
-post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory
-post_provider_url            = todo_ldap
-post_security_principal      = ou=people,o=org,c=us
-post_max_result_size         = 499
-
-# menu settings
-menu_query_name                      = menuData
-application_menu_set_name            = APP
-application_menu_attribute_name      = applicationMenuData
-business_direct_menu_set_name        = BD
-business_direct_menu_attribute_name  = businessDirectMenuData
-
-# Role settings
-sys_admin_role_id = 1
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties
deleted file mode 100755
index 6dbbee8417..0000000000
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/portal.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-# Properties read by ECOMP Framework library, ecompFW.jar
-
-portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
-portal.api.prefix = /api
-max.idle.time = 5
-user.attribute.name = user_attribute
-
-# Legacy property TODO 
-ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm
-
-# URL of the ECOMP Portal REST API
-ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi
-
-#Use REST API instead of UEB to fetch the functional menu data
-use_rest_for_functional_menu=true
-
-# Don't fetch functional menu via UEB in 1610.
-ueb_listeners_enable = false
-
-# Application key is used by session management
-ueb_app_key = MtRwsF16RdpHZ7eM
-
-# The inbox name property should not be required when the REST API is used,
-# but in 1610 FuncMenuController logs ALARM if it cannot find this key.
-ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX-TEST
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties
deleted file mode 100755
index 46048ec520..0000000000
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPDBCAPP/system.properties
+++ /dev/null
@@ -1,63 +0,0 @@
-#Local
-app_display_name = DMaaP Bus Ctlr
-
-db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://portaldb.onap-portal:3306/dbca_os
-db.userName = root
-db.password = password
-db.encrypt_flag = false
-db.hib.dialect = org.hibernate.dialect.MySQLDialect
-db.min_pool_size = 5
-db.max_pool_size = 10
-hb.dialect = org.hibernate.dialect.MySQLDialect
-hb.show_sql = false
-hb.db_reconnect = true
-hb.idle_connection_test_period = 3600
-
-# Directory with the Quantum.lic file
-files_path = /opt/app/tomcat/webapps/dmaap-bc-app/WEB-INF/dbcapp
-
-application_user_id           = 30000
-post_default_role_id          = 16
-clustered                     = true
-
-#Enable Fusion Mobile capabilities for the application
-mobile_enable                            = false
-
-# Cache config file is needed on the classpath
-cache_config_file_path        = /WEB-INF/classes/cache.ccf
-cache_switch                  = 199
-cache_load_on_startup         = false
-
-user_name                                        = fullName
-decryption_key                           = AGLDdG4D04BKm2IxIWEr8o==
-
-#element map files
-element_map_file_path = /tmp
-element_map_icon_path = app/fusionapp/icons/
-
-# Quartz is not used by the DBC application
-# log_cron =
-# mylogins_feed_cron =
-# sessiontimeout_feed_cron =
-# my_login_feed_output_dir =
-
-# ECOMP Portal Shared Context REST API URL is not used by the DBC application
-# ecomp_shared_context_rest_url = 
-
-contact_us_link = https://todo_contact_us_link
-
-# An Unique 128-bit value defined to identify a specific version
-# of an application deployed on a specific virtual machine.
-# This value must be generated and updated by the application 
-# which is using the ECOMP SDK at the time of its deployment.
-# Online Unique UUID generator - https://www.uuidgenerator.net/
-# ID generated for DBC to supply to EELF
-# A bogus value is cached in SCM: 12345678-.. 
-instance_uuid = 12345678-90ab-cdef-1234-567890abcdef
-
-#  R Cloud feature
-guard_notebook_url=https://todo_rcloud_link
-
-# Application base URL is a proper prefix of the on-boarded URL.
-app_base_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPDBCAPP/
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties
index c92a57393e..20285e3677 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/fusion.properties
@@ -1,5 +1,5 @@
 # domain settings
-#domain_class_location = 
+#domain_class_location =
 
 # validator settings
 #default_error_message = Default error message
@@ -31,7 +31,7 @@ home_page          					= /index.html
 
 authentication_mechanism =DBAUTH
 
-login.error.hrid.empty = Login failed, please contact system administrator. 
+login.error.hrid.empty = Login failed, please contact system administrator.
 login.error.hrid.not-found = User not found, please contact system administrator.
 login.error.user.inactive = Account is disabled, please contact system administrator.
 
@@ -40,7 +40,7 @@ login.error.user.inactive = Account is disabled, please contact system administr
 #
 health_poll_interval_seconds = 5
 #
-# If a component is down a log entry will be written that triggers an alert.  This parameter specifies how often this alert should be triggered  
+# If a component is down a log entry will be written that triggers an alert.  This parameter specifies how often this alert should be triggered
 # if the component remains down.   For example a value of 30, would translate to 30 * 60 seconds = 1800 seconds, or every 30 minutes
 #
 health_fail_alert_every_x_intervals =  30
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml
index 0c0d764701..2c319e03a3 100644
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/logback.xml
@@ -1,27 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ================================================================================
-  eCOMP Portal
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
+  ============LICENSE_START==========================================
+  ONAP Portal
+  ===================================================================
+  Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+  ===================================================================
+
+  Unless otherwise specified, all software contained herein is licensed
+  under the Apache License, Version 2.0 (the “License”);
+  you may not use this software except in compliance with the License.
   You may obtain a copy of the License at
-  
+
        http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
   limitations under the License.
-  ================================================================================
+
+  Unless otherwise specified, all documentation contained herein is licensed
+  under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+  you may not use this documentation except in compliance with the License.
+  You may obtain a copy of the License at
+
+              https://creativecommons.org/licenses/by/4.0/
+
+  Unless required by applicable law or agreed to in writing, documentation
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+  ============LICENSE_END============================================
+
+  ECOMP is a trademark and service mark of AT&T Intellectual Property.
   -->
 
 <!DOCTYPE xml>
 <configuration scan="true" scanPeriod="3 seconds" debug="true">
-	<!-- Log-back files for the ECOMP Portal "ecompportal" are created in directory 
+	<!-- Log-back files for the ECOMP Portal "ecompportal" are created in directory
 		${catalina.base}/logs/ecompportal; e.g., apache-tomcat-8.0.35/logs/ecompportal/application.log -->
 	<!--<jmxConfigurator /> -->
 
@@ -42,35 +60,35 @@
 	<property name="metricsLogName" value="metrics" />
 	<property name="auditLogName" value="audit" />
 	<property name="debugLogName" value="debug" />
-	<!-- These loggers are not used in code (yet). <property name="securityLogName" 
-		value="security" /> <property name="policyLogName" value="policy" /> <property 
-		name="performanceLogName" value="performance" /> <property name="serverLogName" 
+	<!-- These loggers are not used in code (yet). <property name="securityLogName"
+		value="security" /> <property name="policyLogName" value="policy" /> <property
+		name="performanceLogName" value="performance" /> <property name="serverLogName"
 		value="server" /> -->
 
 	<!-- ServerFQDN=Server,  -->
 	<property name="auditLoggerPattern"
 		value="%X{AuditLogBeginTimestamp}|%X{AuditLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
-	
+
 	<property name="metricsLoggerPattern"
 		value="%X{MetricsLogBeginTimestamp}|%X{MetricsLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVisualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
-	
+
 	<property name="errorLoggerPattern"
 		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ClassName}|%X{AlertSeverity}|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" />
-	
+
 	<property name="defaultLoggerPattern"
 		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ClassName}| %msg%n" />
-	
+
 	<!-- use %class so library logging calls yield their class name -->
   	<property name="applicationLoggerPattern"
 		value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%class{36}| %msg%n" />
-	
-	<!-- 	
+
+	<!--
 	<property name="defaultPattern"
 		value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
 	<property name="debugLoggerPattern"
 		value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
 	 -->
-	<!-- <property name="debugLoggerPattern" value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|[%caller{3}]|%msg%n" 
+	<!-- <property name="debugLoggerPattern" value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|[%caller{3}]|%msg%n"
 		/> -->
 	<!-- Example evaluator filter applied against console appender -->
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
@@ -83,7 +101,7 @@
 	<!-- EELF Appenders -->
 	<!-- ============================================================================ -->
 
-	<!-- The EELFAppender is used to record events to the general application 
+	<!-- The EELFAppender is used to record events to the general application
 		log -->
 
 
@@ -109,65 +127,65 @@
 		<appender-ref ref="EELF" />
 	</appender>
 
-	<!-- EELF Security Appender. This appender is used to record security events 
-		to the security log file. Security events are separate from other loggers 
-		in EELF so that security log records can be captured and managed in a secure 
-		way separate from the other logs. This appender is set to never discard any 
+	<!-- EELF Security Appender. This appender is used to record security events
+		to the security log file. Security events are separate from other loggers
+		in EELF so that security log records can be captured and managed in a secure
+		way separate from the other logs. This appender is set to never discard any
 		events. -->
-	<!-- <appender name="EELFSecurity" class="ch.qos.logback.core.rolling.RollingFileAppender"> 
-		<file>${logDirectory}/${securityLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> 
-		<fileNamePattern>${logDirectory}/${securityLogName}.%i.log.zip </fileNamePattern> 
-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy 
-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> 
-		</triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder> 
-		</appender> <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender"> 
-		<queueSize>256</queueSize> <discardingThreshold>0</discardingThreshold> <appender-ref 
+	<!-- <appender name="EELFSecurity" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/${securityLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+		<fileNamePattern>${logDirectory}/${securityLogName}.%i.log.zip </fileNamePattern>
+		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
+		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
+		</triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder>
+		</appender> <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender">
+		<queueSize>256</queueSize> <discardingThreshold>0</discardingThreshold> <appender-ref
 		ref="EELFSecurity" /> </appender> -->
 
-	<!-- EELF Performance Appender. This appender is used to record performance 
+	<!-- EELF Performance Appender. This appender is used to record performance
 		records. -->
-	<!-- <appender name="EELFPerformance" class="ch.qos.logback.core.rolling.RollingFileAppender"> 
-		<file>${logDirectory}/${performanceLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> 
-		<fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip </fileNamePattern> 
-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy 
-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> 
-		</triggeringPolicy> <encoder> <outputPatternAsHeader>true</outputPatternAsHeader> 
-		<pattern>${defaultPattern}</pattern> </encoder> </appender> <appender name="asyncEELFPerformance" 
-		class="ch.qos.logback.classic.AsyncAppender"> <queueSize>256</queueSize> 
+	<!-- <appender name="EELFPerformance" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/${performanceLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+		<fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip </fileNamePattern>
+		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
+		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
+		</triggeringPolicy> <encoder> <outputPatternAsHeader>true</outputPatternAsHeader>
+		<pattern>${defaultPattern}</pattern> </encoder> </appender> <appender name="asyncEELFPerformance"
+		class="ch.qos.logback.classic.AsyncAppender"> <queueSize>256</queueSize>
 		<appender-ref ref="EELFPerformance" /> </appender> -->
 
-	<!-- EELF Server Appender. This appender is used to record Server related 
-		logging events. The Server logger and appender are specializations of the 
-		EELF application root logger and appender. This can be used to segregate 
-		Server events from other components, or it can be eliminated to record these 
+	<!-- EELF Server Appender. This appender is used to record Server related
+		logging events. The Server logger and appender are specializations of the
+		EELF application root logger and appender. This can be used to segregate
+		Server events from other components, or it can be eliminated to record these
 		events as part of the application root log. -->
-	<!-- <appender name="EELFServer" class="ch.qos.logback.core.rolling.RollingFileAppender"> 
-		<file>${logDirectory}/${serverLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> 
-		<fileNamePattern>${logDirectory}/${serverLogName}.%i.log.zip </fileNamePattern> 
-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy 
-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> 
-		</triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder> 
-		</appender> <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender"> 
+	<!-- <appender name="EELFServer" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/${serverLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+		<fileNamePattern>${logDirectory}/${serverLogName}.%i.log.zip </fileNamePattern>
+		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
+		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
+		</triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder>
+		</appender> <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender">
 		<queueSize>256</queueSize> <appender-ref ref="EELFServer" /> </appender> -->
 
-	<!-- EELF Policy Appender. This appender is used to record Policy engine 
-		related logging events. The Policy logger and appender are specializations 
-		of the EELF application root logger and appender. This can be used to segregate 
-		Policy engine events from other components, or it can be eliminated to record 
+	<!-- EELF Policy Appender. This appender is used to record Policy engine
+		related logging events. The Policy logger and appender are specializations
+		of the EELF application root logger and appender. This can be used to segregate
+		Policy engine events from other components, or it can be eliminated to record
 		these events as part of the application root log. -->
-	<!-- <appender name="EELFPolicy" class="ch.qos.logback.core.rolling.RollingFileAppender"> 
-		<file>${logDirectory}/${policyLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy"> 
-		<fileNamePattern>${logDirectory}/${policyLogName}.%i.log.zip </fileNamePattern> 
-		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy 
-		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize> 
-		</triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder> 
-		</appender> <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender"> 
+	<!-- <appender name="EELFPolicy" class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/${policyLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+		<fileNamePattern>${logDirectory}/${policyLogName}.%i.log.zip </fileNamePattern>
+		<minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
+		class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
+		</triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder>
+		</appender> <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender">
 		<queueSize>256</queueSize> <appender-ref ref="EELFPolicy" /> </appender> -->
 
-	<!-- EELF Audit Appender. This appender is used to record audit engine related 
-		logging events. The audit logger and appender are specializations of the 
-		EELF application root logger and appender. This can be used to segregate 
-		Policy engine events from other components, or it can be eliminated to record 
+	<!-- EELF Audit Appender. This appender is used to record audit engine related
+		logging events. The audit logger and appender are specializations of the
+		EELF application root logger and appender. This can be used to segregate
+		Policy engine events from other components, or it can be eliminated to record
 		these events as part of the application root log. -->
 
 	<appender name="EELFAudit"
@@ -255,11 +273,11 @@
 		<appender-ref ref="asyncEELF" />
 	</logger>
 
-	<!-- <logger name="com.att.eelf.security" level="info" additivity="false"> 
-		<appender-ref ref="asyncEELFSecurity" /> </logger> <logger name="com.att.eelf.perf" 
-		level="info" additivity="false"> <appender-ref ref="asyncEELFPerformance" 
-		/> </logger> <logger name="com.att.eelf.server" level="info" additivity="false"> 
-		<appender-ref ref="asyncEELFServer" /> </logger> <logger name="com.att.eelf.policy" 
+	<!-- <logger name="com.att.eelf.security" level="info" additivity="false">
+		<appender-ref ref="asyncEELFSecurity" /> </logger> <logger name="com.att.eelf.perf"
+		level="info" additivity="false"> <appender-ref ref="asyncEELFPerformance"
+		/> </logger> <logger name="com.att.eelf.server" level="info" additivity="false">
+		<appender-ref ref="asyncEELFServer" /> </logger> <logger name="com.att.eelf.policy"
 		level="info" additivity="false"> <appender-ref ref="asyncEELFPolicy" /> </logger> -->
 
 	<logger name="com.att.eelf.audit" level="info" additivity="false">
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties
index dc6ef6ace2..0863ef5fc2 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/portal.properties
@@ -1,4 +1,5 @@
-portal.api.impl.class = org.openecomp.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl
+# Not used by portal
+portal.api.impl.class = org.onap.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl.not.used.by.portal
 portal.api.prefix = /api
 max.idle.time = 5
 user.attribute.name = user_attribute
@@ -11,7 +12,7 @@ ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/aux
 
 ueb_listeners_enable = true
 
-ueb_app_key = 7GkVcrO6sIDb3ngW 
+ueb_app_key = 7GkVcrO6sIDb3ngW
 ueb_app_secret = uCYgKjWKK5IxPGNNZzYSSWo9
 ueb_app_mailbox_name = ECOMP-PORTAL-INBOX
 
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties
index d6115b1837..2cb38443a6 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPPORTALAPP/system.properties
@@ -1,8 +1,8 @@
 #mysql
-db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://portaldb.onap-portal:3306/portal
+db.driver = org.mariadb.jdbc.Driver
+db.connectionURL = jdbc:mariadb:failover://portaldb.onap-portal:3306/portal
 db.userName =root
-db.password =password
+db.password =Aa123456
 db.hib.dialect = org.hibernate.dialect.MySQLDialect
 db.min_pool_size = 5
 db.max_pool_size = 10
@@ -44,14 +44,14 @@ log_cron                      = 0 * * * * ? *
 sessiontimeout_feed_cron	  = 0 0/5 * * * ? *
 
 #Front end URL
-frontend_url                  = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/applicationsHome 
+frontend_url                  = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/applicationsHome
 
 #cookie domain
 cookie_domain = openecomp.org
 
 # An Unqiue 128-bit value defined to indentify a specific version of
 # ECOMP Portal deployed on a specific virtual machine.
-# This value must be generated and updated at the time of 
+# This value must be generated and updated at the time of
 # the deployment.
 # Online Unique UUID generator - https://www.uuidgenerator.net/
 instance_uuid 				= 90bc9497-10e6-49fe-916b-dcdfaa972383
@@ -95,3 +95,6 @@ external_access_enable = false
 
 #delete auditlog from number of days ago
 auditlog_del_day_from = 365
+
+#External system notification URL
+external_system_notification_url= https://jira.onap.org/browse/
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties
index 8ce8cc95ad..8ee0a95f74 100644
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/fusion.properties
@@ -8,7 +8,7 @@ login_method_csp            = csp
 login_method_web_junction   = web_junction
 
 #login message
-login.error.hrid.empty = Login failed, please contact system administrator. 
+login.error.hrid.empty = Login failed, please contact system administrator.
 login.error.hrid.not-found = User not found, please contact system administrator.
 login.error.user.inactive = Account is disabled, please contact system administrator.
 
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
index 1e51bdf361..b68ab07f7f 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/portal.properties
@@ -16,7 +16,8 @@ use_rest_for_functional_menu=true
 ##########################################################################
 
 # Name of java class that implements the OnBoardingApiService interface.
-portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
+# epsdk 1.3 uses org.onap prefix
+portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl
 
 # CSP Global Log On for single sign on
 ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm
@@ -25,7 +26,7 @@ ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL
 
 ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi
 
-# Applications do not need to run a UEB listener in 1610.  
+# Applications do not need to run a UEB listener in 1610.
 ueb_listeners_enable = false
 
 # UEB Configuration
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties
index 964c7c479e..d638abcca3 100755
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPSDKAPP/system.properties
@@ -23,11 +23,10 @@ decryption_key				  = AGLDdG4D04BKm2IxIWEr8o==
 # The following properties MAY require changes by partner applications.
 ##########################################################################
 
-#Mysql
-db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://portaldb.onap-portal:3306/ecomp_sdk
+db.driver = org.mariadb.jdbc.Driver
+db.connectionURL = jdbc:mariadb://portaldb.onap-portal:3306/ecomp_sdk
 db.userName = root
-db.password = password
+db.password = Aa123456
 db.min_pool_size = 5
 db.max_pool_size = 10
 hb.dialect = org.hibernate.dialect.MySQLDialect
@@ -53,7 +52,7 @@ contact_us_link = https://todo_contact_us_link.com
 
 # An Unique 128-bit value defined to identify a specific version
 # of an application deployed on a specific virtual machine.
-# This value must be generated and updated by the application 
+# This value must be generated and updated by the application
 # which is using the ECOMP SDK at the time of its deployment.
 # Online Unique UUID generator - https://www.uuidgenerator.net/
 instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d
diff --git a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties
index 6e9f6c013f..baf571eb45 100644
--- a/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties
+++ b/kubernetes/config/docker/init/src/config/portal/portal-fe/webapps/etc/ECOMPWIDGETMS/application.properties
@@ -8,7 +8,7 @@ microservice.widget.location=/tmp
 ## App DB Properties
 spring.datasource.url=jdbc:mysql://portaldb.onap-portal:3306/portal
 spring.datasource.username=root
-spring.datasource.password=password
+spring.datasource.password=Aa123456
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
 spring.database.driver.classname=org.mariadb.jdbc.Driver
 spring.jpa.show-sql=false
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
diff --git a/kubernetes/portal/values.yaml b/kubernetes/portal/values.yaml
index 757995ab63..eadc834599 100644
--- a/kubernetes/portal/values.yaml
+++ b/kubernetes/portal/values.yaml
@@ -3,10 +3,10 @@ pullPolicy: Always
 nodePortPrefix: 302
 image:
   readiness: oomk8s/readiness-check:1.0.0
-  portalapps: nexus3.onap.org:10001/openecomp/portal-apps:1.1-STAGING-latest
-  portaldb: nexus3.onap.org:10001/openecomp/portal-db:1.1-STAGING-latest
+  portalapps: nexus3.onap.org:10001/openecomp/portal-apps:1.3-STAGING-latest
+  portaldb: nexus3.onap.org:10001/openecomp/portal-db:1.3-STAGING-latest
   mariadbClient: oomk8s/mariadb-client-init:1.0.0
-  portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.1-STAGING-latest
+  portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.3-STAGING-latest
   ubuntuInit: oomk8s/ubuntu-init:1.0.0
   ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc
   filebeat: docker.elastic.co/beats/filebeat:5.5.0