summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOfir Sonsino <os0695@intl.att.com>2018-10-18 08:23:13 +0000
committerGerrit Code Review <gerrit@onap.org>2018-10-18 08:23:13 +0000
commitaf0e76fd35fa13538c7d12a7d3187eac632d3d40 (patch)
tree34567ade89b20eefa287b3564c4c156b4abc6949
parentbd1e5afc394d1cfd1adaf4a38d52eb93c46e1ae0 (diff)
parent975779bad94230ec994870aa4084caacee1f7f15 (diff)
Merge "Update portal.properties configuration"
-rwxr-xr-xdeliveries/src/main/docker/docker-files/Dockerfile1
-rwxr-xr-xepsdk-app-onap/src/main/resources/portal.properties3
-rwxr-xr-xepsdk-app-onap/src/main/resources/portal_template.properties3
3 files changed, 7 insertions, 0 deletions
diff --git a/deliveries/src/main/docker/docker-files/Dockerfile b/deliveries/src/main/docker/docker-files/Dockerfile
index f37f81d88..8cd2bc7aa 100755
--- a/deliveries/src/main/docker/docker-files/Dockerfile
+++ b/deliveries/src/main/docker/docker-files/Dockerfile
@@ -49,6 +49,7 @@ ENV AAI_VNF_PROV_STATUS PREPROV,NVTPROV,PROV,CAPPED
ENV VID_ECOMP_REDIRECT_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login.htm
ENV VID_ECOMP_REST_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi
ENV VID_ECOMP_SHARED_CONTEXT_REST_URL http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/context
+ENV VID_ROLE_ACCESS_CENTRALIZED local
ENV VID_CONTACT_US_LINK https://todo_contact_us_link.com
ENV VID_DECRYPTION_KEY AGLDdG4D04BKm2IxIWEr8o=
diff --git a/epsdk-app-onap/src/main/resources/portal.properties b/epsdk-app-onap/src/main/resources/portal.properties
index 104e85dc3..edb35807b 100755
--- a/epsdk-app-onap/src/main/resources/portal.properties
+++ b/epsdk-app-onap/src/main/resources/portal.properties
@@ -61,6 +61,9 @@ ecomp_redirect_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/login
# URL of the ECOMP Portal REST API
ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi
+# Non AAF Mode
+role_access_centralized = local
+
# Applications do not need to run a UEB listener after 1607.
ueb_listeners_enable = false
diff --git a/epsdk-app-onap/src/main/resources/portal_template.properties b/epsdk-app-onap/src/main/resources/portal_template.properties
index d01413aa1..51f39494c 100755
--- a/epsdk-app-onap/src/main/resources/portal_template.properties
+++ b/epsdk-app-onap/src/main/resources/portal_template.properties
@@ -13,6 +13,9 @@ ecomp_redirect_url = ${VID_ECOMP_REDIRECT_URL}
# URL of the ECOMP Portal REST API
ecomp_rest_url = ${VID_ECOMP_REST_URL}
+# AAF Mode
+role_access_centralized = ${VID_ROLE_ACCESS_CENTRALIZED}
+
# UEB servers
ueb_url_list = ${VID_UEB_URL_LIST}