summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Lott (cl778h) <clott@research.att.com>2017-07-19 16:35:41 -0400
committerChristopher Lott (cl778h) <clott@research.att.com>2017-07-19 16:39:14 -0400
commit6057b12ae0a6f770d148fe261951074c978ae15b (patch)
tree27ab77db01fe80943d8a49581c212d90268fdc5c
parent3aec9d2ab7f373a12e052d5e2c1c59b2a19770dc (diff)
Add properties required by core controllers.
These properties were expunged for 1610 but reappeared during the 1702 code rebasing. Code will be cleaned; restoring the properties as a stopgap fix. Issue: Portal-34 Change-Id: If39d82e7c44bd7beedad7ae3ed5a6e9a9dfa00e1 Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
-rw-r--r--.gitreview2
-rw-r--r--ecomp-sdk/epsdk-app-os/README.md1
-rw-r--r--ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties2
3 files changed, 4 insertions, 1 deletions
diff --git a/.gitreview b/.gitreview
index 201d53de..eb646572 100644
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
[gerrit]
host=gerrit.onap.org
port=29418
-project=ecompsdkos.git \ No newline at end of file
+project=portal/sdk.git
diff --git a/ecomp-sdk/epsdk-app-os/README.md b/ecomp-sdk/epsdk-app-os/README.md
index 2ddd5c99..8601a9a7 100644
--- a/ecomp-sdk/epsdk-app-os/README.md
+++ b/ecomp-sdk/epsdk-app-os/README.md
@@ -15,6 +15,7 @@ https://www.eclipse.org/m2e-wtp/
Version 1.3.0
- [Portal-19] Renaming the Group Id in the POM file to org.onap.portal.sdk
+- [Portal-34] Restore required properties in fusion.properties file
Version 1.1.0
- [Portal-7] Improvements added as part of the rebasing process
diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
index 25465cb1..6d792748 100644
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/WEB-INF/fusion/conf/fusion.properties
@@ -1,6 +1,7 @@
# login settings
login_method_backdoor = backdoor
login_method_attribute_name = login_method
+authentication_mechanism = BOTH
#login message
login.error.hrid.empty = Login failed, please contact system administrator.
@@ -10,6 +11,7 @@ login.error.user.inactive = Account is disabled, please contact system administr
# User Session settings
user_attribute_name = user
roles_attribute_name = roles
+role_function_list = role_function_list
role_functions_attribute_name = role_functions
# Import-user LDAP settings