You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mr...@apache.org on 2017/09/11 04:39:22 UTC
[52/94] [abbrv] ambari git commit: AMBARI-21863. Ranger should handle
external Zookeeper properly (mgergely)
AMBARI-21863. Ranger should handle external Zookeeper properly (mgergely)
Change-Id: I751eb3f014b2b5151537456a1b2ee2e9c96578e3
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6e69f214
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6e69f214
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6e69f214
Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 6e69f214c8e45926cdf6757848f0bc42dc9b4917
Parents: 02360dd
Author: Miklos Gergely <mg...@hortonworks.com>
Authored: Wed Sep 6 10:46:26 2017 +0200
Committer: Miklos Gergely <mg...@hortonworks.com>
Committed: Wed Sep 6 10:46:26 2017 +0200
----------------------------------------------------------------------
.../RANGER/0.4.0/package/scripts/params.py | 33 ++++++++++----------
1 file changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/6e69f214/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
index c31181d..d0f0974 100644
--- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/params.py
@@ -287,6 +287,17 @@ has_namenode = len(namenode_hosts) > 0
ugsync_policymgr_alias = config["configurations"]["ranger-ugsync-site"]["ranger.usersync.policymgr.alias"]
ugsync_policymgr_keystore = config["configurations"]["ranger-ugsync-site"]["ranger.usersync.policymgr.keystore"]
+# get comma separated list of zookeeper hosts
+zookeeper_port = default('/configurations/zoo.cfg/clientPort', None)
+zookeeper_hosts = default("/clusterHostInfo/zookeeper_hosts", [])
+index = 0
+zookeeper_quorum = ""
+for host in zookeeper_hosts:
+ zookeeper_quorum += host + ":" + str(zookeeper_port)
+ index += 1
+ if index < len(zookeeper_hosts):
+ zookeeper_quorum += ","
+
# ranger solr
audit_solr_enabled = default('/configurations/ranger-env/xasecure.audit.destination.solr', False)
ranger_solr_config_set = config['configurations']['ranger-env']['ranger_solr_config_set']
@@ -300,12 +311,11 @@ is_solrCloud_enabled = default('/configurations/ranger-env/is_solrCloud_enabled'
is_external_solrCloud_enabled = default('/configurations/ranger-env/is_external_solrCloud_enabled', False)
solr_znode = '/ranger_audits'
if stack_supports_infra_client and is_solrCloud_enabled:
- solr_znode = default('/configurations/ranger-admin-site/ranger.audit.solr.zookeepers', 'NONE')
- if solr_znode != '' and solr_znode.upper() != 'NONE':
- solr_znode = solr_znode.split('/')
- if len(solr_znode) > 1 and len(solr_znode) == 2:
- solr_znode = solr_znode[1]
- solr_znode = format('/{solr_znode}')
+ solr_zookeeper_connect_string = default('/configurations/ranger-admin-site/ranger.audit.solr.zookeepers', 'NONE')
+ if solr_zookeeper_connect_string != '' and solr_zookeeper_connect_string.upper() != 'NONE':
+ pos = solr_zookeeper_connect_string.index("/")
+ solr_znode = solr_zookeeper_connect_string[pos:]
+ zookeeper_quorum = solr_zookeeper_connect_string[:pos]
if has_infra_solr and not is_external_solrCloud_enabled:
solr_znode = config['configurations']['infra-solr-env']['infra_solr_znode']
solr_user = unix_user
@@ -320,17 +330,6 @@ ranger_audit_max_retention_days = config['configurations']['ranger-solr-configur
ranger_audit_logs_merge_factor = config['configurations']['ranger-solr-configuration']['ranger_audit_logs_merge_factor']
ranger_solr_config_content = config['configurations']['ranger-solr-configuration']['content']
-# get comma separated list of zookeeper hosts
-zookeeper_port = default('/configurations/zoo.cfg/clientPort', None)
-zookeeper_hosts = default("/clusterHostInfo/zookeeper_hosts", [])
-index = 0
-zookeeper_quorum = ""
-for host in zookeeper_hosts:
- zookeeper_quorum += host + ":" + str(zookeeper_port)
- index += 1
- if index < len(zookeeper_hosts):
- zookeeper_quorum += ","
-
# solr kerberised
solr_jaas_file = None
is_external_solrCloud_kerberos = default('/configurations/ranger-env/is_external_solrCloud_kerberos', False)