Author: swagle
Date: Fri Apr 5 18:34:30 2013
New Revision: 1465086
URL: http://svn.apache.org/r1465086
Log:
AMBARI-1818. HBase master shuts down immediately after start in a secure
cluster. (swagle)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_master_jaas.conf.erb
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_region_server_jaas.conf.erb
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1465086&r1=1465085&r2=1465086&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Apr 5 18:34:30 2013
@@ -558,6 +558,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1818. HBase master shuts down immediately after start in a secure
+ cluster. (swagle)
+
AMBARI-1816. Security wizard: Add missing secure configs to Hbase service and
make "zookeeper" as default primary name for zookeeper principal. (jaimin)
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp?rev=1465086&r1=1465085&r2=1465086&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/params.pp
Fri Apr 5 18:34:30 2013
@@ -87,8 +87,16 @@ class hdp-hbase::params() inherits hdp::
$hbase_master_jaas_config_file =
hdp_default("hadoop/hbase-site/hbase_master_jaas_config_file",
"${conf_dir}/hbase_master_jaas.conf")
$hbase_regionserver_jaas_config_file =
hdp_default("hadoop/hbase-site/hbase_regionserver_jaas_config_file",
"${conf_dir}/hbase_regionserver_jaas.conf")
- $hbase_master_keytab_path =
hdp_default("hadoop/hbase-site/hbase.master.keytab.file",
"${keytab_path}/hbase.service.keytab")
- $hbase_master_principal =
hdp_default("hadoop/hbase-site/hbase.master.kerberos.principal",
"hbase/_HOST@${kerberos_domain}")
- $hbase_regionserver_keytab_path =
hdp_default("hadoop/hbase-site/hbase.regionserver.keytab.file",
"${keytab_path}/hbase.service.keytab")
- $hbase_regionserver_principal =
hdp_default("hadoop/hbase-site/hbase.regionserver.kerberos.principal",
"hbase/_HOST@${kerberos_domain}")
+ $hbase_master_keytab_path =
hdp_default("hbase-site/hbase.master.keytab.file",
"${keytab_path}/hbase.service.keytab")
+ $hbase_master_principal =
hdp_default("hbase-site/hbase.master.kerberos.principal",
"hbase/_HOST@${kerberos_domain}")
+ $hbase_regionserver_keytab_path =
hdp_default("hbase-site/hbase.regionserver.keytab.file",
"${keytab_path}/hbase.service.keytab")
+ $hbase_regionserver_principal =
hdp_default("hbase-site/hbase.regionserver.kerberos.principal",
"hbase/_HOST@${kerberos_domain}")
+
+ $hbase_primary_name = hdp_default("hbase_primary_name", "hbase")
+ $hostname = $hdp::params::hostname
+ if ($use_hostname_in_principal) {
+ $hbase_jaas_princ = "${hbase_primary_name}/${hostname}@${kerberos_domain}"
+ } else {
+ $hbase_jaas_princ = "${hbase_primary_name}@${kerberos_domain}"
+ }
}
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_master_jaas.conf.erb
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_master_jaas.conf.erb?rev=1465086&r1=1465085&r2=1465086&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_master_jaas.conf.erb
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_master_jaas.conf.erb
Fri Apr 5 18:34:30 2013
@@ -4,5 +4,5 @@ useKeyTab=true
storeKey=true
useTicketCache=false
keyTab="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_master_keytab_path")%>"
-principal="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_master_principal")%>";
+principal="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_jaas_princ")%>";
};
Modified:
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_region_server_jaas.conf.erb
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_region_server_jaas.conf.erb?rev=1465086&r1=1465085&r2=1465086&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_region_server_jaas.conf.erb
(original)
+++
incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_region_server_jaas.conf.erb
Fri Apr 5 18:34:30 2013
@@ -4,5 +4,5 @@ useKeyTab=true
storeKey=true
useTicketCache=false
keyTab="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_regionserver_keytab_path")%>"
-principal="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_regionserver_principal")%>";
+principal="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_jaas_princ")%>";
};
