Repository: ambari Updated Branches: refs/heads/trunk 127ce93e9 -> 112c758df
HBase principal name is constructed from incorrect property. (Andrew O via mahadev) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/112c758d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/112c758d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/112c758d Branch: refs/heads/trunk Commit: 112c758df1849ab7063982262e1b8c408791ff48 Parents: 127ce93 Author: Mahadev Konar <[email protected]> Authored: Thu Mar 20 10:29:02 2014 -0700 Committer: Mahadev Konar <[email protected]> Committed: Thu Mar 20 10:29:05 2014 -0700 ---------------------------------------------------------------------- .../services/HBASE/package/scripts/params.py | 20 ++++---------------- .../services/HBASE/package/scripts/params.py | 17 +++-------------- 2 files changed, 7 insertions(+), 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/112c758d/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py index 80ce0d7..8b8afbf 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HBASE/package/scripts/params.py @@ -40,7 +40,7 @@ security_enabled = ( not is_empty(_authentication) and _authentication == 'kerbe user_group = config['configurations']['global']['user_group'] # this is "hadoop-metrics2-hbase.properties" for 2.x stacks -metric_prop_file_name = "hadoop-metrics.properties" +metric_prop_file_name = "hadoop-metrics.properties" # not supporting 32 bit jdk. java64_home = config['hostLevelParams']['java_home'] @@ -68,22 +68,10 @@ smokeuser_permissions = default('smokeuser_permissions', "RWXCA") service_check_data = functions.get_unique_id_and_date() if security_enabled: - - _use_hostname_in_principal = default('instance_name', True) - _master_primary_name = config['configurations']['global']['hbase_master_primary_name'] _hostname_lowercase = config['hostname'].lower() - _kerberos_domain = config['configurations']['global']['kerberos_domain'] - _master_principal_name = config['configurations']['global']['hbase_master_principal_name'] - _regionserver_primary_name = config['configurations']['global']['hbase_regionserver_primary_name'] - - - if _use_hostname_in_principal: - master_jaas_princ = format("{_master_primary_name}/{_hostname_lowercase}@{_kerberos_domain}") - regionserver_jaas_princ = format("{_regionserver_primary_name}/{_hostname_lowercase}@{_kerberos_domain}") - else: - master_jaas_princ = format("{_master_principal_name}@{_kerberos_domain}") - regionserver_jaas_princ = format("{_regionserver_primary_name}@{_kerberos_domain}") - + master_jaas_princ = config['configurations']['hbase-site']['hbase.master.kerberos.principal'].replace('_HOST',_hostname_lowercase) + regionserver_jaas_princ = config['configurations']['hbase-site']['hbase.regionserver.kerberos.principal'].replace('_HOST',_hostname_lowercase) + master_keytab_path = config['configurations']['hbase-site']['hbase.master.keytab.file'] regionserver_keytab_path = config['configurations']['hbase-site']['hbase.regionserver.keytab.file'] smoke_user_keytab = config['configurations']['global']['smokeuser_keytab'] http://git-wip-us.apache.org/repos/asf/ambari/blob/112c758d/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py index ba7d3c1..f999683 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/HBASE/package/scripts/params.py @@ -70,21 +70,10 @@ smokeuser_permissions = default('smokeuser_permissions', "RWXCA") service_check_data = functions.get_unique_id_and_date() if security_enabled: - - _use_hostname_in_principal = default('instance_name', True) - _master_primary_name = config['configurations']['global']['hbase_master_primary_name'] _hostname_lowercase = config['hostname'].lower() - _kerberos_domain = config['configurations']['global']['kerberos_domain'] - _master_principal_name = config['configurations']['global']['hbase_master_principal_name'] - _regionserver_primary_name = config['configurations']['global']['hbase_regionserver_primary_name'] - - if _use_hostname_in_principal: - master_jaas_princ = format("{_master_primary_name}/{_hostname_lowercase}@{_kerberos_domain}") - regionserver_jaas_princ = format("{_regionserver_primary_name}/{_hostname_lowercase}@{_kerberos_domain}") - else: - master_jaas_princ = format("{_master_principal_name}@{_kerberos_domain}") - regionserver_jaas_princ = format("{_regionserver_primary_name}@{_kerberos_domain}") - + master_jaas_princ = config['configurations']['hbase-site']['hbase.master.kerberos.principal'].replace('_HOST',_hostname_lowercase) + regionserver_jaas_princ = config['configurations']['hbase-site']['hbase.regionserver.kerberos.principal'].replace('_HOST',_hostname_lowercase) + master_keytab_path = config['configurations']['hbase-site']['hbase.master.keytab.file'] regionserver_keytab_path = config['configurations']['hbase-site']['hbase.regionserver.keytab.file'] smoke_user_keytab = config['configurations']['global']['smokeuser_keytab']
