Repository: ambari Updated Branches: refs/heads/trunk ce8f5aaa0 -> 91c628dad
Revert "AMBARI-11238. When Kerberizing a cluster with Ranger HBase plugin enabled, HBase coprocessor properties in hbase-site are overwritten (and breaks Ranger HBase plugin) (Emil Anca via rlevas)" This reverts commit ce8f5aaa0bfbdc48f71140cd89c47d3aa7869dcf. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/990193e9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/990193e9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/990193e9 Branch: refs/heads/trunk Commit: 990193e97c99917b2c072d0691f634b155306c8e Parents: ce8f5aa Author: Robert Levas <[email protected]> Authored: Wed May 20 10:15:52 2015 -0400 Committer: Robert Levas <[email protected]> Committed: Wed May 20 10:15:52 2015 -0400 ---------------------------------------------------------------------- .../common-services/HBASE/0.96.0.2.0/kerberos.json | 4 ++-- .../HBASE/0.96.0.2.0/package/scripts/params_linux.py | 15 ++------------- 2 files changed, 4 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/990193e9/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json index 5da0846..125a9c9 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/kerberos.json @@ -40,8 +40,8 @@ "hbase.security.authentication": "kerberos", "hbase.security.authorization": "true", "zookeeper.znode.parent": "/hbase-secure", - "hbase.coprocessor.master.classes": "{{hbase_coprocessor_master_classes}}", - "hbase.coprocessor.region.classes": "{{hbase_coprocessor_region_classes}}", + "hbase.coprocessor.master.classes": "org.apache.hadoop.hbase.security.access.AccessController", + "hbase.coprocessor.region.classes": "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.hadoop.hbase.security.access.AccessController", "hbase.bulkload.staging.dir": "/apps/hbase/staging" } } http://git-wip-us.apache.org/repos/asf/ambari/blob/990193e9/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py index 7d83550..410a690 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py @@ -215,8 +215,9 @@ policy_user = config['configurations']['ranger-hbase-plugin-properties']['policy #For curl command in ranger plugin to get db connector jdk_location = config['hostLevelParams']['jdk_location'] java_share_dir = '/usr/share/java' -enable_ranger_hbase = (config['configurations']['ranger-hbase-plugin-properties']['ranger-hbase-plugin-enabled'].lower() == 'yes') + if has_ranger_admin: + enable_ranger_hbase = (config['configurations']['ranger-hbase-plugin-properties']['ranger-hbase-plugin-enabled'].lower() == 'yes') xa_audit_db_password = unicode(config['configurations']['admin-properties']['audit_db_password']) repo_config_password = unicode(config['configurations']['ranger-hbase-plugin-properties']['REPOSITORY_CONFIG_PASSWORD']) xa_audit_db_flavor = (config['configurations']['admin-properties']['DB_FLAVOR']).lower() @@ -274,15 +275,3 @@ if has_ranger_admin: ssl_keystore_password = unicode(config['configurations']['ranger-hbase-policymgr-ssl']['xasecure.policymgr.clientssl.keystore.password']) ssl_truststore_password = unicode(config['configurations']['ranger-hbase-policymgr-ssl']['xasecure.policymgr.clientssl.truststore.password']) credential_file = format('/etc/ranger/{repo_name}/cred.jceks') - -# Used to dynamically set the hbase-site props that are referenced during Kerbenization -if security_enabled: - if not enable_ranger_hbase: # Default props, no ranger plugin - hbase_coprocessor_master_classes = "org.apache.hadoop.hbase.security.access.AccessController" - hbase_coprocessor_region_classes = "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.hadoop.hbase.security.access.AccessController" - elif xml_configurations_supported: # HDP stack 2.3+ ranger plugin enabled - hbase_coprocessor_master_classes = "org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor " - hbase_coprocessor_region_classes = "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor" - else: # HDP Stack 2.2 and less / ranger plugin enabled - hbase_coprocessor_master_classes = "com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor" - hbase_coprocessor_region_classes = "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor"
