You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metron.apache.org by ot...@apache.org on 2018/11/18 18:15:23 UTC
[10/52] [abbrv] metron git commit: METRON-1861 METRON-1861: REST
fails to start when LDAP enabled and 'Active Spring profiles' config is empty
(anandsubbu via justinleet) closes apache/metron#1256
METRON-1861 METRON-1861: REST fails to start when LDAP enabled and 'Active Spring profiles' config is empty (anandsubbu via justinleet) closes apache/metron#1256
Project: http://git-wip-us.apache.org/repos/asf/metron/repo
Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/7bba8be0
Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/7bba8be0
Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/7bba8be0
Branch: refs/heads/feature/METRON-1090-stellar-assignment
Commit: 7bba8be0cb77136459c25af697163d76fcf45100
Parents: 85cd21a
Author: anandsubbu <an...@gmail.com>
Authored: Thu Nov 8 09:08:39 2018 -0500
Committer: leet <le...@apache.org>
Committed: Thu Nov 8 09:08:39 2018 -0500
----------------------------------------------------------------------
.../METRON/CURRENT/package/scripts/params/params_linux.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/metron/blob/7bba8be0/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
----------------------------------------------------------------------
diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
index 75f68fc..060dfe4 100755
--- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
+++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py
@@ -62,7 +62,10 @@ metron_jvm_flags = config['configurations']['metron-rest-env']['metron_jvm_flags
# Construct the profiles as a temp variable first. Only the first time it's set will carry through
metron_spring_profiles_temp = config['configurations']['metron-rest-env']['metron_spring_profiles_active']
if config['configurations']['metron-security-env']['metron.ldap.enabled']:
- metron_spring_profiles_active = metron_spring_profiles_temp + ',ldap'
+ if metron_spring_profiles_temp:
+ metron_spring_profiles_active = metron_spring_profiles_temp + ',ldap'
+ else:
+ metron_spring_profiles_active = 'ldap'
else:
metron_spring_profiles_active = metron_spring_profiles_temp