Repository: ambari
Updated Branches:
  refs/heads/trunk d1df0800c -> 9d789a374


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

Branch: refs/heads/trunk
Commit: 9d789a374ff3e442a112449968f8e19730aa166b
Parents: d1df080
Author: Vitaly Brodetskyi <[email protected]>
Authored: Mon Aug 22 23:32:12 2016 +0300
Committer: Vitaly Brodetskyi <[email protected]>
Committed: Mon Aug 22 23:32:12 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, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/9d789a37/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 85ecb15..bb0497e 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
@@ -89,7 +89,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/9d789a37/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 931a764..b039ca5 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