From 5689d5f064eff1440be723603895947c7d720b15 Mon Sep 17 00:00:00 2001 From: Keren Joseph Date: Sun, 22 Apr 2018 15:22:46 +0300 Subject: Updated AAI to latest images - sparky - sparky configuration files are separated from image, and are in the aai/test-config project. AAI and OOM teams agreed that minimal configuration will be added to the image eventually, but until then all files are mapped. - a change in logback.xml was made to match the logback for aai/test-config project file for search-data, in order to get the pod up and running with minimal changes to app files. Issue-ID: OOM-947 Change-Id: Ife863ccd50615f40c21a9c72e666d4ab14c6011e Signed-off-by: Keren Joseph Signed-off-by: Karen Joseph Signed-off-by: Keren Joseph --- .../portal/BOOT-INF/classes/portal.properties | 23 ++++++++++++++++++ .../config/portal/portal-authentication.properties | 28 +++++++++++----------- .../resources/config/portal/portal.properties | 23 ------------------ .../resources/config/portal/roles.config | 6 +++++ 4 files changed, 43 insertions(+), 37 deletions(-) create mode 100644 kubernetes/aai/charts/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties delete mode 100644 kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal.properties create mode 100644 kubernetes/aai/charts/aai-sparky-be/resources/config/portal/roles.config (limited to 'kubernetes/aai/charts/aai-sparky-be/resources/config/portal') diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties new file mode 100644 index 0000000000..3d4ec09887 --- /dev/null +++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties @@ -0,0 +1,23 @@ +################################################################################ +############################## Portal properties ############################### +################################################################################ + +# Java class that implements the ECOMP role and user mgt API +portal.api.impl.class = org.onap.aai.sparky.security.portal.PortalRestAPIServiceImpl + +# Instance of ECOMP Portal where the app has been on-boarded +# use insecure http for dev purposes to avoid self-signed certificate +ecomp_rest_url = http://portalapps.{{.Release.Namespace}}:8989/ONAPPORTAL/auxapi + +# Standard global logon page +ecomp_redirect_url = http://portalapps.{{.Release.Namespace}}:8989/ONAPPORTAL/login.htm + +# Name of cookie to extract on login request +csp_cookie_name = EPService +# Alternate values: DEVL, V_DEVL, V_PROD +csp_gate_keeper_prod_key = PROD + +# Toggles use of UEB +ueb_listeners_enable = false +# IDs application withing UEB flow +ueb_app_key = qFKles9N8gDTV0Zc diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal-authentication.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal-authentication.properties index 0873fc1c61..a0e3308435 100644 --- a/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal-authentication.properties +++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal-authentication.properties @@ -1,14 +1,14 @@ -########################################################################################## -############################## eCOMP Portal Auth Properties ############################## -########################################################################################## - -############################## Auth ############################## -username=aaiui -password=1t2v1vfv1unz1vgz1t3b - -############################## ############################## -# -# ONAP Cookie Processing - During initial development, this flag, if true, will -# prevent the portal interface's login processing from searching for a user -# specific cookie, and will instead allow passage if a valid session cookie is discovered. -onap_enabled=true \ No newline at end of file +##################################################################################### +############################## Portal Auth Properties ############################## +##################################################################################### + +############################## Auth ############################## +username={{.Values.config.portalUsername}} +password={{.Values.config.portalPassword}} + +############################## ############################## +# +# ONAP Cookie Processing - During initial development, this flag, if true, will +# prevent the portal interface's login processing from searching for a user +# specific cookie, and will instead allow passage if a valid session cookie is discovered. +onap_enabled={{.Values.config.portalOnapEnabled}} diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal.properties b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal.properties deleted file mode 100644 index 04a19555e2..0000000000 --- a/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/portal.properties +++ /dev/null @@ -1,23 +0,0 @@ -###################################################################################### -############################## eCOMP Portal properties ############################### -###################################################################################### - -# Java class that implements the ECOMP role and user mgt API -portal.api.impl.class = org.openecomp.sparky.security.portal.PortalRestAPIServiceImpl - -# Instance of ECOMP Portal where the app has been on-boarded -# use insecure http for dev purposes to avoid self-signed certificate -ecomp_rest_url = http://portalapps.{{.Release.Namespace}}:8989/ONAPPORTAL/auxapi - -# Standard global logon page -ecomp_redirect_url = http://portalapps.{{.Release.Namespace}}:8989/ONAPPORTAL/login.htm - -# Name of cookie to extract on login request -csp_cookie_name = EPService -# Alternate values: DEVL, V_DEVL, V_PROD -csp_gate_keeper_prod_key = PROD - -# Toggles use of UEB -ueb_listeners_enable = false -# IDs application withing UEB flow -ueb_app_key = qFKles9N8gDTV0Zc diff --git a/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/roles.config b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/roles.config new file mode 100644 index 0000000000..b8313bd378 --- /dev/null +++ b/kubernetes/aai/charts/aai-sparky-be/resources/config/portal/roles.config @@ -0,0 +1,6 @@ +[ + { + "id":1, + "name":"View" + } +] \ No newline at end of file -- cgit