Sfoglia il codice sorgente

AMBARI-8307 Perm 400 for spnego keytab, unable to start webhcat. (atkach)

Andrii Tkach 10 anni fa
parent
commit
6f915a4e49

+ 10 - 1
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');
     }

+ 2 - 2
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",

+ 1 - 0
ambari-web/app/messages.js

@@ -1121,6 +1121,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. ' +