You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by vb...@apache.org on 2016/08/22 20:40:36 UTC
ambari git commit: (Revert)AMBARI-18233. Check Atlas work when Ranger
installed.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 76322c7bc -> 4410a5a59
(Revert)AMBARI-18233. Check Atlas work when Ranger installed.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4410a5a5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4410a5a5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4410a5a5
Branch: refs/heads/branch-2.4
Commit: 4410a5a596401b1be466345108706f0d46d1fcf5
Parents: 76322c7
Author: Vitaly Brodetskyi <vb...@hortonworks.com>
Authored: Mon Aug 22 23:40:00 2016 +0300
Committer: Vitaly Brodetskyi <vb...@hortonworks.com>
Committed: Mon Aug 22 23:40:00 2016 +0300
----------------------------------------------------------------------
.../ATLAS/0.1.0.2.3/package/scripts/metadata_server.py | 2 +-
.../common-services/ATLAS/0.1.0.2.3/package/scripts/params.py | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4410a5a5/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
index ed0314b..e547a05 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/metadata_server.py
@@ -87,7 +87,7 @@ class MetadataServer(Script):
try_sleep = 10,
user=params.hbase_user
)
- elif params.enable_ranger_hbase and not params.security_enabled:
+ elif params.has_ranger_admin and params.has_hbase_master and not params.security_enabled:
Execute(atlas_hbase_setup_command,
tries = 5,
try_sleep = 10,
http://git-wip-us.apache.org/repos/asf/ambari/blob/4410a5a5/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
index 95f63bc..f9d0a6b 100644
--- a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
+++ b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/package/scripts/params.py
@@ -279,8 +279,6 @@ if has_ranger_admin and stack_supports_atlas_ranger_plugin:
xa_audit_hdfs_is_enabled = default('/configurations/ranger-atlas-audit/xasecure.audit.destination.hdfs', False)
enable_ranger_atlas = config['configurations']['ranger-atlas-plugin-properties']['ranger-atlas-plugin-enabled']
enable_ranger_atlas = not is_empty(enable_ranger_atlas) and enable_ranger_atlas.lower() == 'yes'
- enable_ranger_hbase = config['configurations']['ranger-hbase-plugin-properties']['ranger-hbase-plugin-enabled']
- enable_ranger_hbase = not is_empty(enable_ranger_hbase) and enable_ranger_hbase.lower() == 'yes'
policymgr_mgr_url = config['configurations']['admin-properties']['policymgr_external_url']
downloaded_custom_connector = None