summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOfir Sonsino <os0695@intl.att.com>2020-03-04 21:05:28 +0200
committerYuli Shlosberg <ys9693@att.com>2020-03-05 09:13:26 +0000
commit8f29cc7a6dec1881d8e4197b0585ed1c0f616f16 (patch)
tree7ac8b64c0b3e14b495cc2049a53edf398af86972
parent0b4c1941df3e0019471742e3edaab81b06ef6f44 (diff)
portal and cadi properties fix
Change-Id: Id83f0ddd1846e4887d1d5a7c3fb5bf8db406186a Issue-ID: SDC-2799 Signed-off-by: Ofir Sonsino <os0695@intl.att.com>
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb5
-rw-r--r--catalog-be/src/main/resources/cadi.properties8
-rw-r--r--catalog-fe/src/main/resources/portal.properties3
3 files changed, 7 insertions, 9 deletions
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb
index 7e7eea407e..73316266e7 100644
--- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb
+++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb
@@ -58,7 +58,7 @@ portal.api.impl.class = org.openecomp.sdc.be.ecomp.PortalRestAPICentralServiceIm
role_access_centralized = remote
# Cookie set by CSP-SSO
-csp_cookie_name = onapCsp
+#csp_cookie_name = onapCsp
# CSP setting, most use PROD; DEV also recognized
csp_gate_keeper_prod_key = PROD
@@ -80,8 +80,7 @@ portal.api.impl.class = org.openecomp.sdc.be.ecomp.PortalRestAPICentralServiceIm
portal_app_name = <%= @portal_app_name %>
portal_pass = <%= @ecomp_portal_pass %>
portal_user = <%= @ecomp_portal_user %>
-# Use this tag if the app is centralized remote/local
-role_access_centralized = remote
+
# UEB key generated while on-boarding
ueb_app_key = ""
diff --git a/catalog-be/src/main/resources/cadi.properties b/catalog-be/src/main/resources/cadi.properties
index 5b6c24ffe0..0d6aee1d99 100644
--- a/catalog-be/src/main/resources/cadi.properties
+++ b/catalog-be/src/main/resources/cadi.properties
@@ -1,15 +1,15 @@
# Configure AAF
-aaf_locate_url=https://aafist.test.att.com:8095
-aaf_url=https://aafist.test.att.com:8095/locate/com.att.aaf.service:2.0
+aaf_locate_url=https://aaf.onap.org:8095
+aaf_url=https://aaf.onap.org:8095/locate/
#aaf_url=https://DME2RESOLVE/service=com.att.authz.AuthorizationService/version=2.0/envContext=TEST/routeOffer=BAU_SE
#if you are running aaf service from a docker image you have to use aaf service IP and port number
-aaf_id=m00468@portal.ecomp.att.com
+aaf_id=sdc@onap
#Encrypt the password using AAF Jar
aaf_password= enc:uI_J4jBL4YUcIZZa5uZKj3QMUC63hbS8TmDn5PSp5nO
# Sample CADI Properties, from CADI 1.4.2
-hostname=ecomp.att.com
+hostname=onapportal
csp_domain=PROD
# Add Absolute path to Keyfile
diff --git a/catalog-fe/src/main/resources/portal.properties b/catalog-fe/src/main/resources/portal.properties
index d1b6d3a44e..321e1aa247 100644
--- a/catalog-fe/src/main/resources/portal.properties
+++ b/catalog-fe/src/main/resources/portal.properties
@@ -5,8 +5,7 @@ ecomp_rest_url = https://ecomp.homer.att.com/ecompportal/auxapi
portal.api.impl.class = org.openecomp.sdc.be.ecomp.EcompIntImpl
# CSP-SSO URL
-ecomp_redirect_url = https://www.e-access.att.com/ecomp_portal_qa/ecompportal/process_csp
-#ecomp_redirect_url = http://127.0.0.1:8989/ECOMPPORTAL/login.htm
+ecomp_redirect_url = http://127.0.0.1:8989/ECOMPPORTAL/login.htm
# Cookie set by CSP-SSO
csp_cookie_name = attESSec