Merge "[AAI] Make AAI helm3 compatible"

2 files changed, 8 insertions, 1 deletions

diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties
index e18585d576..2592e5ca7c 100644
--- a/kubernetes/aai/components/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties
+++ b/kubernetes/aai/components/aai-sparky-be/resources/config/portal/BOOT-INF/classes/portal.properties
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +19,7 @@
 ################################################################################
 
 # Java class that implements the ECOMP role and user mgt API
+*/}}
 portal.api.impl.class = org.onap.aai.sparky.security.portal.PortalRestAPICentralServiceImpl
 
 # Instance of ECOMP Portal where the app has been on-boarded
diff --git a/kubernetes/aai/components/aai-sparky-be/resources/config/portal/portal-authentication.properties b/kubernetes/aai/components/aai-sparky-be/resources/config/portal/portal-authentication.properties
index 97b5399f54..e1ddd326f9 100644
--- a/kubernetes/aai/components/aai-sparky-be/resources/config/portal/portal-authentication.properties
+++ b/kubernetes/aai/components/aai-sparky-be/resources/config/portal/portal-authentication.properties
@@ -1,3 +1,4 @@
+{{/*

 # Copyright © 2018 Amdocs, Bell Canada, AT&T

 #

 # Licensed under the Apache License, Version 2.0 (the "License");

@@ -17,14 +18,18 @@
 #####################################################################################

 

 ############################## 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.

+# specific cookie, and will instead allow passage if a valid session cookie is

+# discovered.

+*/}}

 onap_enabled={{.Values.config.portalOnapEnabled}}

 onap.user_id_cookie_name={{.Values.config.portalCookieName}}

 cookie_decryptor_classname={{.Values.config.cookieDecryptorClass}}