You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2013/05/28 22:55:16 UTC
svn commit: r1487115 - in /incubator/ambari/trunk: ./
ambari-agent/src/main/puppet/modules/hdp-hbase/manifests/
ambari-agent/src/main/puppet/modules/hdp-hbase/templates/
ambari-web/app/data/
Author: jaimin
Date: Tue May 28 20:55:16 2013
New Revision: 1487115
URL: http://svn.apache.org/r1487115
Log:
AMBARI-2201. Hbase master and regionserver should use same keytab. (jaimin)
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_regionserver_jaas.conf.erb
incubator/ambari/trunk/ambari-web/app/data/secure_configs.js
incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js
incubator/ambari/trunk/ambari-web/app/data/secure_properties.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1487115&r1=1487114&r2=1487115&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Tue May 28 20:55:16 2013
@@ -895,6 +895,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-2201. Hbase master and regionserver should use same keytab. (jaimin)
+
AMBARI-2162. HBase master stop fails while stopping all services in
secure cluster. (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=1487115&r1=1487114&r2=1487115&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 Tue May 28 20:55:16 2013
@@ -87,9 +87,8 @@ class hdp-hbase::params() inherits hdp::
$hbase_master_jaas_config_file = hdp_default("hbase_master_jaas_config_file", "${conf_dir}/hbase_master_jaas.conf")
$hbase_regionserver_jaas_config_file = hdp_default("hbase_regionserver_jaas_config_file", "${conf_dir}/hbase_regionserver_jaas.conf")
- $hbase_master_keytab_path = hdp_default("hbase-site/hbase.master.keytab.file", "${keytab_path}/hbase.service.keytab")
+ $hbase_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")
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=1487115&r1=1487114&r2=1487115&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 Tue May 28 20:55:16 2013
@@ -3,6 +3,6 @@ com.sun.security.auth.module.Krb5LoginMo
useKeyTab=true
storeKey=true
useTicketCache=false
-keyTab="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_master_keytab_path")%>"
+keyTab="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_keytab_path")%>"
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_regionserver_jaas.conf.erb
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_regionserver_jaas.conf.erb?rev=1487115&r1=1487114&r2=1487115&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_regionserver_jaas.conf.erb (original)
+++ incubator/ambari/trunk/ambari-agent/src/main/puppet/modules/hdp-hbase/templates/hbase_regionserver_jaas.conf.erb Tue May 28 20:55:16 2013
@@ -3,6 +3,6 @@ com.sun.security.auth.module.Krb5LoginMo
useKeyTab=true
storeKey=true
useTicketCache=false
-keyTab="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_regionserver_keytab_path")%>"
+keyTab="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_keytab_path")%>"
principal="<%=scope.function_hdp_template_var("::hdp-hbase::params::hbase_jaas_princ")%>";
};
Modified: incubator/ambari/trunk/ambari-web/app/data/secure_configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/secure_configs.js?rev=1487115&r1=1487114&r2=1487115&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/secure_configs.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/secure_configs.js Tue May 28 20:55:16 2013
@@ -86,8 +86,7 @@ module.exports = [
displayName: 'HBase',
filename: 'hbase-site',
configCategories: [
- App.ServiceConfigCategory.create({ name: 'HBase Master', displayName: 'HBase Master'}),
- App.ServiceConfigCategory.create({ name: 'RegionServer', displayName: 'RegionServer'})
+ App.ServiceConfigCategory.create({ name: 'HBase', displayName: 'HBase'})
],
sites: ['hbase-site'],
configs: configProperties.filterProperty('serviceName', 'HBASE')
@@ -96,7 +95,7 @@ module.exports = [
serviceName: 'ZOOKEEPER',
displayName: 'ZooKeeper',
configCategories: [
- App.ServiceConfigCategory.create({ name: 'ZooKeeper Server'})
+ App.ServiceConfigCategory.create({ name: 'ZooKeeper Server', displayName: 'ZooKeeper Server'})
],
configs: configProperties.filterProperty('serviceName', 'ZOOKEEPER')
@@ -106,7 +105,7 @@ module.exports = [
displayName: 'Oozie',
filename: 'oozie-site',
configCategories: [
- App.ServiceConfigCategory.create({ name: 'Oozie Server'})
+ App.ServiceConfigCategory.create({ name: 'Oozie Server', displayName: 'Oozie Server'})
],
sites: ['oozie-site'],
configs: configProperties.filterProperty('serviceName', 'OOZIE')
Modified: incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js?rev=1487115&r1=1487114&r2=1487115&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/secure_mapping.js Tue May 28 20:55:16 2013
@@ -111,16 +111,16 @@ module.exports = [
},
{
"name": "dfs.datanode.address",
- "templateName": [],
+ "templateName": ["dfs_datanode_address"],
"foreignKey": null,
- "value": "0.0.0.0:1019",
+ "value": "0.0.0.0:<templateName[0]>",
"filename": "hdfs-site.xml"
},
{
"name": "dfs.datanode.http.address",
- "templateName": [],
+ "templateName": ["dfs_datanode_http_address"],
"foreignKey": null,
- "value": "0.0.0.0:1022",
+ "value": "0.0.0.0:<templateName[0]>",
"filename": "hdfs-site.xml"
},
{
@@ -160,7 +160,7 @@ module.exports = [
},
{
"name": "hbase.master.keytab.file",
- "templateName": ["hbase_master_keytab"],
+ "templateName": ["hbase_service_keytab"],
"foreignKey": null,
"value": "<templateName[0]>",
"filename": "hbase-site.xml"
@@ -174,7 +174,7 @@ module.exports = [
},
{
"name": "hbase.regionserver.keytab.file",
- "templateName": ["regionserver_keytab"],
+ "templateName": ["hbase_service_keytab"],
"foreignKey": null,
"value": "<templateName[0]>",
"filename": "hbase-site.xml"
@@ -349,13 +349,6 @@ module.exports = [
"filename": "hbase-site.xml"
},
{
- "name": "hbase.coprocessor.region.classes",
- "templateName": [],
- "foreignKey": null,
- "value": "org.apache.hadoop.hbase.security.token.TokenProvider,org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.hadoop.hbase.security.access.AccessController",
- "filename": "hbase-site.xml"
- },
- {
"name": "hbase.bulkload.staging.dir",
"templateName": [],
"foreignKey": null,
Modified: incubator/ambari/trunk/ambari-web/app/data/secure_properties.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/data/secure_properties.js?rev=1487115&r1=1487114&r2=1487115&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/data/secure_properties.js (original)
+++ incubator/ambari/trunk/ambari-web/app/data/secure_properties.js Tue May 28 20:55:16 2013
@@ -23,7 +23,7 @@ module.exports =
"name": "security_enabled",
"displayName": "Enable security",
"value": "",
- "defaultValue":true,
+ "defaultValue":"true",
"description": "Enable kerberos security for the cluster",
"isVisible": false,
"isOverridable": false,
@@ -164,6 +164,32 @@ module.exports =
},
{
"id": "puppet var",
+ "name": "dfs_datanode_address",
+ "displayName": "Datanode address",
+ "value": "",
+ "defaultValue": "1019",
+ "description": "Address for DataNode",
+ "displayType": "principal",
+ "isVisible": false,
+ "isOverridable": false,
+ "serviceName": "HDFS",
+ "category": "DataNode"
+ },
+ {
+ "id": "puppet var",
+ "name": "dfs_datanode_http_address",
+ "displayName": "Datanode HTTP address",
+ "value": "",
+ "defaultValue": "1022",
+ "description": "Address for DataNode",
+ "displayType": "principal",
+ "isVisible": false,
+ "isOverridable": false,
+ "serviceName": "HDFS",
+ "category": "DataNode"
+ },
+ {
+ "id": "puppet var",
"name": "datanode_primary_name",
"displayName": "Primary name",
"value": "",
@@ -249,7 +275,7 @@ module.exports =
"displayName": "Primary name",
"value": "",
"defaultValue": "hbase",
- "description": "Primary name for HBase master",
+ "description": "Primary name for HBase",
"displayType": "principal",
"isVisible": true,
"isOverridable": false,
@@ -258,29 +284,16 @@ module.exports =
},
{
"id": "puppet var",
- "name": "hbase_master_keytab",
+ "name": "hbase_service_keytab",
"displayName": "Path to Keytab file",
"value": "",
- "defaultValue": "/etc/security/keytabs/hm.service.keytab",
+ "defaultValue": "/etc/security/keytabs/hbase.service.keytab",
"description": "keytab for HBase master",
"displayType": "directory",
"isVisible": true,
"isOverridable": false,
"serviceName": "HBASE",
- "category": "HBase Master"
- },
- {
- "id": "puppet var",
- "name": "regionserver_keytab",
- "displayName": "Path to Keytab file",
- "value": "",
- "defaultValue": "/etc/security/keytabs/rs.service.keytab",
- "description": "keytab for RegionServer",
- "displayType": "directory",
- "isVisible": true,
- "isOverridable": false,
- "serviceName": "HBASE",
- "category": "RegionServer"
+ "category": "HBase"
},
//HIVE