Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a6bb655b9 -> 4a6ea8425


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/850405b8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/850405b8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/850405b8

Branch: refs/heads/branch-2.5
Commit: 850405b8dcbae5a63e695643870642cdb5cac29e
Parents: 8b6da62
Author: Vitaly Brodetskyi <[email protected]>
Authored: Mon Aug 22 23:32:12 2016 +0300
Committer: Sumit Mohanty <[email protected]>
Committed: Mon Aug 29 18:20:55 2016 -0700

----------------------------------------------------------------------
 .../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, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/850405b8/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 e547a05..ed0314b 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.has_ranger_admin and params.has_hbase_master and not 
params.security_enabled:
+        elif params.enable_ranger_hbase 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/850405b8/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 f9d0a6b..95f63bc 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,6 +279,8 @@ 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

Reply via email to