summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstatta <statta@research.att.com>2020-05-26 00:01:53 -0400
committerstatta <statta@research.att.com>2020-05-26 00:02:19 -0400
commit91625da3bd1581c14a5d32fc67065db0116fd545 (patch)
treec2f4f1fe63dff9daac815da36d6728e179b05754
parent388d1164b2cbf3435b5f38cbfd8d597d4a9567b0 (diff)
Update Docker and Props
Issue-ID: PORTAL-911 Change-Id: I85c6a63f8f3608b53b2d28951d9bfef76bbef6d2 Signed-off-by: statta <statta@research.att.com>
-rw-r--r--deliveries/.env4
-rw-r--r--ecomp-portal-BE-os/src/main/webapp/WEB-INF/conf/system.properties8
2 files changed, 6 insertions, 6 deletions
diff --git a/deliveries/.env b/deliveries/.env
index 614aeb0c..333eb9eb 100644
--- 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 3ca32b85..a3aa565f 100644
--- 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