diff options
| author |   Michael Lando <ml636r@att.com> | 2017-06-09 03:19:04 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2017-06-09 03:19:04 +0300 |
| commit | ed64b5edff15e702493df21aa3230b81593e6133 (patch) | |
| tree | a4cb01fdaccc34930a8db403a3097c0d1e40914b /catalog-fe/src/main/resources | |
| parent | 280f8015d06af1f41a3ef12e8300801c7a5e0d54 (diff) | |
[SDC-29] catalog 1707 rebase commit.
Change-Id: I43c3dc5cf44abf5da817649bc738938a3e8388c1
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-fe/src/main/resources')
| -rw-r--r-- | catalog-fe/src/main/resources/config/configuration.yaml | 12 | ||||
| -rw-r--r-- | catalog-fe/src/main/resources/portal.properties | 7 |
2 files changed, 10 insertions, 9 deletions
diff --git a/catalog-fe/src/main/resources/config/configuration.yaml b/catalog-fe/src/main/resources/config/configuration.yaml index 6be93b330d..cd123ca220 100644 --- a/catalog-fe/src/main/resources/config/configuration.yaml +++ b/catalog-fe/src/main/resources/config/configuration.yaml @@ -17,30 +17,30 @@ beProtocol: http beSslPort: 8443 # threadpool size for handling requests -threadpoolSize: 50 +threadpoolSize: 50 # request processing timeout (seconds) requestTimeout: 10 +# Determines the health check read timeout when invoking health check towards the LB (or BE whatever is configured): healthCheckSocketTimeoutInMs: 5000 - healthCheckIntervalInSeconds: 5 -identificationHeaderFields: +identificationHeaderFields: - - &HTTP_IV_USER HTTP_IV_USER - &iv-user iv-user - - &USER_ID USER_ID - - &user-id user-id + - &csp-userId csp-userId - - &HTTP_CSP_ATTUID HTTP_CSP_ATTUID - &csp-attuid csp-attuid - - - &HTTP_CSP_WSTYPE HTTP_CSP_WSTYPE + - &HTTP_CSP_WSTYPE HTTP_CSP_WSTYPE - &csp-wstype csp-wstype -optionalHeaderFields: +optionalHeaderFields: - - &HTTP_CSP_FIRSTNAME HTTP_CSP_FIRSTNAME - &csp-firstname csp-firstname diff --git a/catalog-fe/src/main/resources/portal.properties b/catalog-fe/src/main/resources/portal.properties index 880c4fe9e9..a146d6ef0c 100644 --- a/catalog-fe/src/main/resources/portal.properties +++ b/catalog-fe/src/main/resources/portal.properties @@ -1,11 +1,12 @@ # Portal REST URL, ends "/auxapi" -ecomp_rest_url = https://portal.api.simpledemo.openecomp.org/ecompportal/auxapi +ecomp_rest_url = https://ecomp.homer.att.com/ecompportal/auxapi # Java implementation of interface portal.api.impl.class = org.openecomp.sdc.be.ecomp.EcompIntImpl # CSP-SSO URL -ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm +# ecomp_redirect_url = https://www.e-access.att.com/ecomp_portal_ist/ecompportal/process_csp +ecomp_redirect_url = http://127.0.0.1:8989/ECOMPPORTAL/login.htm # Cookie set by CSP-SSO csp_cookie_name = attESSec @@ -13,7 +14,7 @@ csp_cookie_name = attESSec csp_gate_keeper_prod_key = PROD # Comma-separated list of UEB server names -ueb_url_list = +ueb_url_list = localhost # UEB topic where Portal listens ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX-TEST # UEB key generated while on-boarding |