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/11/13 16:03:44 UTC
ambari git commit: AMBARI-8307 Perm 400 for spnego keytab,
unable to start webhcat. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 0fa486535 -> e9fbad71c
AMBARI-8307 Perm 400 for spnego keytab, unable to start webhcat. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e9fbad71
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e9fbad71
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e9fbad71
Branch: refs/heads/branch-1.7.0
Commit: e9fbad71c1ea5221afad82a591dcede92d97f217
Parents: 0fa4865
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Thu Nov 13 17:03:26 2014 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Thu Nov 13 17:03:26 2014 +0200
----------------------------------------------------------------------
.../app/controllers/main/admin/security/add/step3.js | 11 ++++++++++-
ambari-web/app/data/HDP2/secure_properties.js | 4 ++--
ambari-web/app/messages.js | 1 +
3 files changed, 13 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/e9fbad71/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 32d3edc..c94f42f 100644
--- a/ambari-web/app/controllers/main/admin/security/add/step3.js
+++ b/ambari-web/app/controllers/main/admin/security/add/step3.js
@@ -126,6 +126,13 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
keytab: 'apptimelineserver_http_keytab',
displayName: Em.I18n.t('admin.addSecurity.user.yarn.atsHTTPUser'),
isHadoop2Stack: true
+ },
+ {
+ componentName: 'STORM_UI_SERVER',
+ principal: 'storm_ui_principal_name',
+ keytab: 'storm_ui_keytab',
+ displayName: Em.I18n.t('admin.addSecurity.storm.user.httpUser'),
+ isHadoop22Stack: true
}
],
@@ -279,6 +286,8 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
//add specific components that supported only in Hadoop2 stack
if (component.isHadoop2Stack && !App.get('isHadoop2Stack')) return;
+ if (component.isHadoop22Stack && !App.get('isHadoop22Stack')) return;
+
if (hostComponents.someProperty('componentName', component.componentName)) {
if (component.componentName === "APP_TIMELINE_SERVER" && (!isATSInstalled || !doesATSSupportKerberos)) {
@@ -346,7 +355,7 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
setHostComponentsSecureValue: function (result, host, addedPrincipalsHost, securityUsers, hadoopGroupId) {
var componentsToDisplay = ['NAMENODE', 'SECONDARY_NAMENODE', 'DATANODE', 'JOBTRACKER', 'ZOOKEEPER_SERVER', 'HIVE_SERVER', 'TASKTRACKER',
'OOZIE_SERVER', 'NAGIOS_SERVER', 'HBASE_MASTER', 'HBASE_REGIONSERVER', 'HISTORYSERVER', 'RESOURCEMANAGER', 'NODEMANAGER', 'JOURNALNODE',
- 'SUPERVISOR', 'NIMBUS', 'STORM_UI_SERVER', 'FALCON_SERVER', 'KNOX_GATEWAY', 'APP_TIMELINE_SERVER'];
+ 'SUPERVISOR', 'NIMBUS', 'FALCON_SERVER', 'KNOX_GATEWAY', 'APP_TIMELINE_SERVER'];
if (App.get('isHadoop22Stack')) {
componentsToDisplay.push('DRPC_SERVER');
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/e9fbad71/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 77cfc9a..06da094 100644
--- a/ambari-web/app/data/HDP2/secure_properties.js
+++ b/ambari-web/app/data/HDP2/secure_properties.js
@@ -1276,7 +1276,7 @@ var storm22Properties = [
},
{
"id": "puppet var",
- "name": "strom_ui_principal_name",
+ "name": "storm_ui_principal_name",
"displayName": "Storm UI principal name",
"value": "",
"defaultValue": "HTTP/_HOST",
@@ -1291,7 +1291,7 @@ var storm22Properties = [
},
{
"id": "puppet var",
- "name": "strom_ui_keytab",
+ "name": "storm_ui_keytab",
"displayName": "Path to Nimbus UI keytab file",
"value": "",
"defaultValue": "/etc/security/keytabs/spnego.service.keytab",
http://git-wip-us.apache.org/repos/asf/ambari/blob/e9fbad71/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index af1523b..306eefe 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1094,6 +1094,7 @@ Em.I18n.translations = {
'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.storm.user.httpUser': 'Storm UI Server',
'admin.addSecurity.user.yarn.atsHTTPUser': 'YARN ATS HTTP User',
'admin.addSecurity.knox.user': 'Knox Gateway',
'admin.addSecurity.enable.onClose': 'You are in the process of enabling security on your cluster. ' +