Repository: ambari Updated Branches: refs/heads/branch-2.2 1eb5de019 -> c2ced5c25
Revert "AMBARI-14562. Ranger - If configured audit store is 'solr', then audit_store value should be 'solr'(gautam)" This reverts commit c5e6cb75de56375e1a52b75c78cb4ab6f3592339. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2ced5c2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2ced5c2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2ced5c2 Branch: refs/heads/branch-2.2 Commit: c2ced5c25a66321cc903cad403710e6c51ea96f9 Parents: 1eb5de0 Author: Jaimin Jetly <[email protected]> Authored: Wed Feb 17 19:52:38 2016 +0530 Committer: Jaimin Jetly <[email protected]> Committed: Wed Feb 17 19:52:38 2016 +0530 ---------------------------------------------------------------------- .../RANGER/0.4.0/package/scripts/setup_ranger_xml.py | 5 ----- .../services/RANGER/configuration/ranger-admin-site.xml | 10 ---------- .../resources/stacks/HDP/2.3/services/stack_advisor.py | 11 ----------- .../test/python/stacks/2.3/common/test_stack_advisor.py | 3 +-- 4 files changed, 1 insertion(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/c2ced5c2/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py index 4f9b260..fcceaa6 100644 --- a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py +++ b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/package/scripts/setup_ranger_xml.py @@ -192,11 +192,6 @@ def setup_ranger_db(upgrade_type=None): owner = params.unix_user, ) - ModifyPropertiesFile(format("{ranger_home}/install.properties"), - properties = {'audit_store': params.ranger_audit_source_type}, - owner = params.unix_user, - ) - if params.db_flavor.lower() == 'sqla': ModifyPropertiesFile(format("{ranger_home}/install.properties"), properties = {'SQL_CONNECTOR_JAR': format('{ranger_home}/ews/lib/{jdbc_jar_name}')}, http://git-wip-us.apache.org/repos/asf/ambari/blob/c2ced5c2/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml index 16fae19..462fe56 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/RANGER/configuration/ranger-admin-site.xml @@ -159,16 +159,6 @@ <name>ranger.audit.source.type</name> <value>solr</value> <description>db or solr, based on the audit destination used</description> - <depends-on> - <property> - <type>ranger-env</type> - <name>xasecure.audit.destination.solr</name> - </property> - <property> - <type>ranger-env</type> - <name>xasecure.audit.destination.db</name> - </property> - </depends-on> </property> <property> http://git-wip-us.apache.org/repos/asf/ambari/blob/c2ced5c2/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py index 8892349..71b0e2a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py @@ -625,17 +625,6 @@ class HDP23StackAdvisor(HDP22StackAdvisor): rangerAuditProperty = services["configurations"][item['filename']]["properties"][item['configname']] putRangerAuditProperty(item['target_configname'], rangerAuditProperty) - audit_solr_flag = 'false' - audit_db_flag = 'false' - ranger_audit_source_type = 'solr' - if 'ranger-env' in services['configurations'] and 'xasecure.audit.destination.solr' in services['configurations']["ranger-env"]["properties"]: - audit_solr_flag = services['configurations']["ranger-env"]["properties"]['xasecure.audit.destination.solr'] - if 'ranger-env' in services['configurations'] and 'xasecure.audit.destination.db' in services['configurations']["ranger-env"]["properties"]: - audit_db_flag = services['configurations']["ranger-env"]["properties"]['xasecure.audit.destination.db'] - - if audit_db_flag == 'true' and audit_solr_flag == 'false': - ranger_audit_source_type = 'db' - putRangerAdminProperty('ranger.audit.source.type',ranger_audit_source_type) def recommendYARNConfigurations(self, configurations, clusterData, services, hosts): http://git-wip-us.apache.org/repos/asf/ambari/blob/c2ced5c2/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py index f0ad51b..d1501c9 100644 --- a/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py +++ b/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py @@ -1529,8 +1529,7 @@ class TestHDP23StackAdvisor(TestCase): }, 'ranger-admin-site': { 'properties': { - "ranger.audit.solr.zookeepers": "NONE", - "ranger.audit.source.type": "solr" + "ranger.audit.solr.zookeepers": "NONE" } }, 'ranger-env': {
