Repository: metron Updated Branches: refs/heads/master 073d6b50d -> 5a6370a63
METRON-1110 REST jvm flags property is being overwritten when Kerberos is enabled (merrimanr) closes apache/metron#697 Project: http://git-wip-us.apache.org/repos/asf/metron/repo Commit: http://git-wip-us.apache.org/repos/asf/metron/commit/5a6370a6 Tree: http://git-wip-us.apache.org/repos/asf/metron/tree/5a6370a6 Diff: http://git-wip-us.apache.org/repos/asf/metron/diff/5a6370a6 Branch: refs/heads/master Commit: 5a6370a630fb51a69cd5313e74ab694d68ade187 Parents: 073d6b5 Author: merrimanr <merrim...@gmail.com> Authored: Wed Aug 16 08:39:47 2017 -0500 Committer: merrimanr <merrim...@apache.org> Committed: Wed Aug 16 08:39:47 2017 -0500 ---------------------------------------------------------------------- .../METRON/CURRENT/package/scripts/management_ui_master.py | 1 - .../METRON/CURRENT/package/scripts/params/params_linux.py | 1 + .../common-services/METRON/CURRENT/package/scripts/rest_master.py | 3 --- 3 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/metron/blob/5a6370a6/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py index 8ab82a8..e858ed3 100644 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/management_ui_master.py @@ -44,7 +44,6 @@ class ManagementUIMaster(Script): print 'configure managment_ui' from params import params env.set_params(params) - File(format("/etc/default/metron"), content=Template("metron.j2") ) http://git-wip-us.apache.org/repos/asf/metron/blob/5a6370a6/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 22ccabc..b524940 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 @@ -203,6 +203,7 @@ client_jaas_path = metron_home + '/client_jaas.conf' client_jaas_arg = '-Djava.security.auth.login.config=' + metron_home + '/client_jaas.conf' enrichment_topology_worker_childopts = client_jaas_arg if security_enabled else '' indexing_topology_worker_childopts = client_jaas_arg if security_enabled else '' +metron_jvm_flags += (' ' + client_jaas_arg) if security_enabled else '' topology_auto_credentials = config['configurations']['storm-site'].get('nimbus.credential.renewers.classes', []) # Needed for storm.config, because it needs Java String topology_auto_credentials_double_quotes = str(topology_auto_credentials).replace("'", '"') http://git-wip-us.apache.org/repos/asf/metron/blob/5a6370a6/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py ---------------------------------------------------------------------- diff --git a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py index dc0a27f..9331759 100755 --- a/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py +++ b/metron-deployment/packaging/ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/package/scripts/rest_master.py @@ -38,9 +38,6 @@ class RestMaster(Script): def configure(self, env, upgrade_type=None, config_dir=None): from params import params - if params.security_enabled: - params.metron_jvm_flags = format('-Djava.security.auth.login.config={client_jaas_path}') - env.set_params(params) File(format("/etc/default/metron"), content=Template("metron.j2")
