Update Docker and Props

Issue-ID: PORTAL-911
Change-Id: I85c6a63f8f3608b53b2d28951d9bfef76bbef6d2
Signed-off-by: statta <statta@research.att.com>

diff --git a/deliveries/.env b/deliveries/.env
index 614aeb0..333eb9e 100644 (file)
--- a/deliveries/.env
+++ b/deliveries/.env
@@ -38,11 +38,11 @@ CLI_IMG_NAME=onap/cli
 
 # This is the first portion of the Docker image tag
 # that is published to the ONAP registry.
-PORTAL_VERSION=3.2.0
+PORTAL_VERSION=3.3.0
 
 # This is used during builds and in docker-compose;
 # it is never published to the ONAP registry.
-PORTAL_TAG=elalto
+PORTAL_TAG=guilin
 
 # Name of directory in apps container (NOT host)
 WEBAPPS_DIR=/opt/apache-tomcat-8.0.37/webapps

diff --git a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties
index 3ca32b8..a3aa565 100644 (file)
--- a/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties
+++ b/ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties
@@ -40,7 +40,7 @@ db.driver = org.mariadb.jdbc.Driver
 #db.connectionURL = jdbc:mariadb:failover://localhost:3306/ecomp_portal
 #db.userName = XXXX
 #db.password = XXXX
-db.connectionURL = jdbc:mariadb:failover://localhost:3306/portal_2_6_os
+db.connectionURL = jdbc:mariadb:failover://localhost:3306/portal_3_2_os
 db.userName = root
 db.password = root
 # is the db.password property encrypted?
@@ -145,9 +145,9 @@ window_width_threshold_right_menu = 1350
 external_system_notification_url= https://jira.onap.org/browse/
 
 # External Access System Basic Auth Credentials & Rest endpoint(These credentials doesn't work as these are place holders for now)
-ext_central_access_user_name = m00468@portal.onap.org
-ext_central_access_password = dR2NABMkxPaFbIbym87ZwQ==
-ext_central_access_url = https://aaftest.test.onap.org:8095/proxy/authz/
+ext_central_access_user_name = aaf_admin@people.osaaf.org
+ext_central_access_password = CkmGguWw+Yn0yzqximmSExkOSJ7BdKvOTHFmTMg9Yvc=
+ext_central_access_url = https://aaf-service:31110/authz/
 ext_central_access_user_domain = @csp.onap.org
 
 # External Central Auth system access