You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2014/10/10 14:05:13 UTC
git commit: AMBARI-7722 Enabling Kerberos on 2.2 Stack HS2 issues.
(atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 1fd8eb665 -> 196b4df7d
AMBARI-7722 Enabling Kerberos on 2.2 Stack HS2 issues. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/196b4df7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/196b4df7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/196b4df7
Branch: refs/heads/trunk
Commit: 196b4df7da885c84b286646bf1859a358f78530e
Parents: 1fd8eb6
Author: atkach <at...@hortonworks.com>
Authored: Fri Oct 10 15:05:00 2014 +0300
Committer: atkach <at...@hortonworks.com>
Committed: Fri Oct 10 15:05:00 2014 +0300
----------------------------------------------------------------------
.../main/admin/security/add/step3.js | 6 +++++
ambari-web/app/data/HDP2/secure_mapping.js | 16 ++++++++++++
ambari-web/app/data/HDP2/secure_properties.js | 26 ++++++++++++++++++++
ambari-web/app/messages.js | 1 +
4 files changed, 49 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/196b4df7/ambari-web/app/controllers/main/admin/security/add/step3.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/security/add/step3.js b/ambari-web/app/controllers/main/admin/security/add/step3.js
index 0e69371..7afa51f 100644
--- a/ambari-web/app/controllers/main/admin/security/add/step3.js
+++ b/ambari-web/app/controllers/main/admin/security/add/step3.js
@@ -74,6 +74,12 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
displayName: Em.I18n.t('admin.addSecurity.webhcat.user.httpUser')
},
{
+ componentName: 'HIVE_SERVER',
+ principal: 'hive_metastore_http_principal_name',
+ keytab: 'hive_metastore_http_keytab',
+ displayName: Em.I18n.t('admin.addSecurity.hive.user.httpUser')
+ },
+ {
componentName: 'OOZIE_SERVER',
principal: 'oozie_http_principal_name',
keytab: 'oozie_http_keytab',
http://git-wip-us.apache.org/repos/asf/ambari/blob/196b4df7/ambari-web/app/data/HDP2/secure_mapping.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/secure_mapping.js b/ambari-web/app/data/HDP2/secure_mapping.js
index 5d9261c..23a89e0 100644
--- a/ambari-web/app/data/HDP2/secure_mapping.js
+++ b/ambari-web/app/data/HDP2/secure_mapping.js
@@ -425,6 +425,22 @@ module.exports = [
"serviceName": "HIVE"
},
{
+ "name": "hive.server2.authentication.spnego.principal",
+ "templateName": ["hive_metastore_http_principal_name", "kerberos_domain"],
+ "foreignKey": null,
+ "value": "<templateName[0]>@<templateName[1]>",
+ "filename": "hive-site.xml",
+ "serviceName": "HIVE"
+ },
+ {
+ "name": "hive.server2.authentication.spnego.keytab",
+ "templateName": ["hive_metastore_http_keytab"],
+ "foreignKey": null,
+ "value": "<templateName[0]>",
+ "filename": "hive-site.xml",
+ "serviceName": "HIVE"
+ },
+ {
"name": "oozie.service.AuthorizationService.authorization.enabled",
"templateName": [],
"foreignKey": null,
http://git-wip-us.apache.org/repos/asf/ambari/blob/196b4df7/ambari-web/app/data/HDP2/secure_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/secure_properties.js b/ambari-web/app/data/HDP2/secure_properties.js
index 6733f12..10d1a41 100644
--- a/ambari-web/app/data/HDP2/secure_properties.js
+++ b/ambari-web/app/data/HDP2/secure_properties.js
@@ -829,6 +829,32 @@ var props = {
"category": "Hive Metastore",
"component": "HIVE_SERVER"
},
+ {
+ "id": "puppet var",
+ "name": "hive_metastore_http_principal_name",
+ "displayName": "Web principal name",
+ "value": "",
+ "defaultValue": "HTTP/_HOST",
+ "description": "Principal name for SPNEGO access to Hive Metastore and HiveServer2. _HOST will get automatically replaced with actual hostname at an instance of Hive Metastore and HiveServer2",
+ "displayType": "principal",
+ "isVisible": true,
+ "isOverridable": false,
+ "serviceName": "HIVE",
+ "category": "Hive Metastore"
+ },
+ {
+ "id": "puppet var",
+ "name": "hive_metastore_http_keytab",
+ "displayName": "Path to SPNEGO keytab file",
+ "value": "",
+ "defaultValue": "/etc/security/keytabs/spnego.service.keytab",
+ "description": "Path to SPNEGO keytab file for Hive Metastore and HiveServer2",
+ "displayType": "directory",
+ "isVisible": true,
+ "isOverridable": false,
+ "serviceName": "HIVE",
+ "category": "Hive Metastore"
+ },
/**********************************************OOZIE***************************************/
{
http://git-wip-us.apache.org/repos/asf/ambari/blob/196b4df7/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 6974f4f..7d935e0 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1087,6 +1087,7 @@ Em.I18n.translations = {
'admin.addSecurity.nm.user.httpUser': 'NodeManager SPNEGO User',
'admin.addSecurity.historyServer.user.httpUser': 'History server SPNEGO User',
'admin.addSecurity.webhcat.user.httpUser': 'WebHCat SPNEGO User',
+ 'admin.addSecurity.hive.user.httpUser': 'Hive SPNEGO User',
'admin.addSecurity.oozie.user.httpUser': 'Oozie SPNEGO User',
'admin.addSecurity.falcon.user.httpUser': 'Falcon SPNEGO User',
'admin.addSecurity.user.yarn.atsUser': 'YARN ATS User',