Repository: ambari Updated Branches: refs/heads/trunk d581b4e55 -> 8e835618b
AMBARI-16922. Remove LogSearch dependency for Ranger - Fix variable name (Mugdha Varadkar via gautam) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8e835618 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8e835618 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8e835618 Branch: refs/heads/trunk Commit: 8e835618b7ca2318f12b0aee9e1e73dd92b4feb0 Parents: d581b4e Author: Gautam Borad <[email protected]> Authored: Mon May 30 13:27:56 2016 +0530 Committer: Gautam Borad <[email protected]> Committed: Mon May 30 14:49:33 2016 +0530 ---------------------------------------------------------------------- .../src/main/resources/stacks/HDP/2.5/services/stack_advisor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8e835618/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py index 658e6aa..613004d 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py @@ -1193,7 +1193,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor): ranger_audit_zk_port = '' - if 'LOGSEARCH' in servicesList and zookeeper_host_port and is_solrCloud_enabled: + if 'LOGSEARCH' in servicesList and zookeeper_host_port and isSolrCloudEnabled: zookeeper_host_port = zookeeper_host_port.split(',') zookeeper_host_port.sort() zookeeper_host_port = ",".join(zookeeper_host_port) @@ -1204,7 +1204,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor): logsearch_solr_znode = services['configurations']['logsearch-solr-env']['properties']['logsearch_solr_znode'] ranger_audit_zk_port = '{0}{1}'.format(zookeeper_host_port, logsearch_solr_znode) putRangerAdminProperty('ranger.audit.solr.zookeepers', ranger_audit_zk_port) - elif zookeeper_host_port and is_solrCloud_enabled: + elif zookeeper_host_port and isSolrCloudEnabled: ranger_audit_zk_port = '{0}/{1}'.format(zookeeper_host_port, 'ranger_audits') putRangerAdminProperty('ranger.audit.solr.zookeepers', ranger_audit_zk_port) else:
