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

Branch: refs/heads/2.4.0-maint
Commit: a9407164cb33caf2830f8bd31fd047c56be23576
Parents: c7d812e
Author: Vitaly Brodetskyi <[email protected]>
Authored: Mon Aug 22 23:48:17 2016 +0300
Committer: Vitaly Brodetskyi <[email protected]>
Committed: Mon Aug 22 23:48:17 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/a9407164/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/a9407164/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