AMBARI-2338. Security Wizard: HTTP principal is repeated in various services and can have distinct keytabs, which would cause failure. (jaimin via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1491328 13f79535-47bb-0310-9956-ffa450edef68

ambari-web/app/controllers/main/admin/security/add/step3.js

@@ -317,9 +317,7 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
     var self = this;
     //prepare tags to fetch all configuration for a service
     this.get('content.services').forEach(function (_secureService) {
-      if (_secureService.serviceName !== 'GENERAL') {
         self.setServiceTagNames(_secureService, data.Clusters.desired_configs);
-      }
     });
     this.getAllConfigurations();
   },
@@ -333,7 +331,6 @@ App.MainAdminSecurityAddStep3Controller = Em.Controller.extend({
    * set tagnames for configuration of the *-site.xml
    */
   setServiceTagNames: function (secureService, configs) {
-    console.log("TRACE: In setServiceTagNames function:");
     //var serviceConfigTags = this.get('serviceConfigTags');
     for (var index in configs) {
       if (secureService.sites && secureService.sites.contains(index)) {

ambari-web/app/data/secure_configs.js

@@ -30,6 +30,7 @@ module.exports = [
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'KERBEROS', displayName: 'General'})
     ],
+    sites: ['global','webhcat-site'],
     configs: configProperties.filterProperty('serviceName', 'GENERAL')
   },
   {
@@ -41,7 +42,7 @@ module.exports = [
       App.ServiceConfigCategory.create({ name: 'NameNode', displayName: 'NameNode'}),
       App.ServiceConfigCategory.create({ name: 'DataNode', displayName: 'DataNode'})
     ],
-    sites: ['global', 'core-site', 'hdfs-site'],
+    sites: ['core-site', 'hdfs-site'],
     configs: configProperties.filterProperty('serviceName', 'HDFS')
   },
 
@@ -67,18 +68,6 @@ module.exports = [
     sites: ['hive-site'],
     configs: configProperties.filterProperty('serviceName', 'HIVE')
   },
-
-  {
-    serviceName: 'WEBHCAT',
-    displayName: 'WebHCat',
-    filename: 'webhcat-site',
-    configCategories: [
-      App.ServiceConfigCategory.create({ name: 'WebHCat', displayName: 'WebHCat'})
-    ],
-    sites: ['webhcat-site'],
-    configs: configProperties.filterProperty('serviceName', 'WEBHCAT')
-  },
-
   {
     serviceName: 'HBASE',
     displayName: 'HBase',

ambari-web/app/data/secure_mapping.js

@@ -265,14 +265,14 @@ module.exports = [
   },
   {
     "name": "oozie.authentication.kerberos.principal",
-    "templateName": ["oozie_http_primary_name", "kerberos_domain"],
+    "templateName": ["hadoop_http_primary_name", "kerberos_domain"],
     "foreignKey": null,
     "value": "<templateName[0]>@<templateName[1]>",
     "filename": "oozie-site.xml"
   },
   {
     "name": "oozie.authentication.kerberos.keytab",
-    "templateName": ["oozie_http_keytab"],
+    "templateName": ["hadoop_http_keytab"],
     "foreignKey": null,
     "value": "<templateName[0]>",
     "filename": "oozie-site.xml"
@@ -286,14 +286,14 @@ module.exports = [
   },
   {
     "name": "templeton.kerberos.principal",
-    "templateName": ["webhcat_http_primary_name", "kerberos_domain"],
+    "templateName": ["hadoop_http_primary_name", "kerberos_domain"],
     "foreignKey": null,
     "value": "<templateName[0]>@<templateName[1]>",
     "filename": "webhcat-site.xml"
   },
   {
     "name": "templeton.kerberos.keytab",
-    "templateName": ["webhcat_http_keytab"],
+    "templateName": ["hadoop_http_keytab"],
     "foreignKey": null,
     "value": "<templateName[0]>",
     "filename": "webhcat-site.xml"

ambari-web/app/data/secure_properties.js

@@ -94,60 +94,60 @@ module.exports =
       "serviceName": "GENERAL",
       "category": "KERBEROS"
     },
-
-    //HDFS
     {
       "id": "puppet var",
-      "name": "namenode_primary_name",
-      "displayName": "Primary name",
+      "name": "hadoop_http_primary_name",
+      "displayName": "HTTP Primary name",
       "value": "",
-      "defaultValue": "nn",
-      "description": "Primary name for NameNode",
+      "defaultValue": "HTTP",
+      "isReconfigurable": false,
+      "description": "Primary name for spnego access for NameNode, SNameNode, Oozie and WebHCat",
       "displayType": "principal",
       "isVisible": true,
       "isOverridable": false,
-      "serviceName": "HDFS",
-      "category": "NameNode"
+      "serviceName": "GENERAL",
+      "category": "KERBEROS"
     },
     {
       "id": "puppet var",
-      "name": "namenode_keytab",
-      "displayName": "Path to Keytab File",
+      "name": "hadoop_http_keytab",
+      "displayName": "Path to HTTP keytab file",
       "value": "",
-      "defaultValue": "/etc/security/keytabs/nn.service.keytab",
-      "description": "Keytab for NameNode",
+      "defaultValue": "/etc/security/keytabs/spnego.service.keytab",
+      "description": "Path to HTTP keytab file for NameNode, SNameNode, Oozie and WebHCat",
       "displayType": "directory",
       "isVisible": true,
       "isOverridable": false,
-      "serviceName": "HDFS",
-      "category": "NameNode"
+      "serviceName": "GENERAL",
+      "category": "KERBEROS"
     },
+
+    //HDFS
     {
       "id": "puppet var",
-      "name": "hadoop_http_primary_name",
-      "displayName": "HTTP Primary name",
+      "name": "namenode_primary_name",
+      "displayName": "Primary name",
       "value": "",
-      "defaultValue": "HTTP",
-      "isReconfigurable": false,
-      "description": "Primary name for spnego access for NameNode",
+      "defaultValue": "nn",
+      "description": "Primary name for NameNode and SNameNode",
       "displayType": "principal",
       "isVisible": true,
       "isOverridable": false,
       "serviceName": "HDFS",
-      "category": "General"
+      "category": "NameNode"
     },
     {
       "id": "puppet var",
-      "name": "hadoop_http_keytab",
-      "displayName": "Path to HTTP keytab file",
+      "name": "namenode_keytab",
+      "displayName": "Path to Keytab File",
       "value": "",
-      "defaultValue": "/etc/security/keytabs/spnego.service.keytab",
-      "description": "Keytab for http NameNode and SNameNode",
+      "defaultValue": "/etc/security/keytabs/nn.service.keytab",
+      "description": "Path to NameNode and SNameNode keytab file",
       "displayType": "directory",
       "isVisible": true,
       "isOverridable": false,
       "serviceName": "HDFS",
-      "category": "General"
+      "category": "NameNode"
     },
     {
       "id": "puppet var",
@@ -247,7 +247,7 @@ module.exports =
       "displayName": "Path to keytab file",
       "value": "",
       "defaultValue": "/etc/security/keytabs/tt.service.keytab",
-      "description": "keytab for TaskTracker",
+      "description": "Path to TaskTracker keytab file",
       "displayType": "directory",
       "isVisible": true,
       "isOverridable": false,
@@ -262,12 +262,12 @@ module.exports =
       "displayName": "Primary name",
       "value": "",
       "defaultValue": "hbase",
-      "description": "Primary name for HBase",
+      "description": "Primary name for HBase master and RegionServer",
       "displayType": "principal",
       "isVisible": true,
       "isOverridable": false,
       "serviceName": "HBASE",
-      "category": "HBase Master"
+      "category": "HBase"
     },
     {
       "id": "puppet var",
@@ -275,7 +275,7 @@ module.exports =
       "displayName": "Path to Keytab file",
       "value": "",
       "defaultValue": "/etc/security/keytabs/hbase.service.keytab",
-      "description": "keytab for HBase master",
+      "description": "Path to HBase master and RegionServer keytab file",
       "displayType": "directory",
       "isVisible": true,
       "isOverridable": false,
@@ -303,7 +303,7 @@ module.exports =
       "displayName": "Path to Keytab file",
       "value": "",
       "defaultValue": "/etc/security/keytabs/hive.service.keytab",
-      "description": "keytab for Hive Metastore",
+      "description": "Path to Hive Metastore keytab file",
       "displayType": "directory",
       "isVisible": true,
       "isOverridable": false,
@@ -332,72 +332,13 @@ module.exports =
       "displayName": "Path to keytab file",
       "value": "",
       "defaultValue": "/etc/security/keytabs/oozie.service.keytab",
-      "description": "Keytab for Oozie server",
+      "description": "Path to Oozie server keytab file",
       "displayType": "directory",
       "isVisible": true,
       "isOverridable": false,
       "serviceName": "OOZIE",
       "category": "Oozie Server"
     },
-    {
-      "id": "puppet var",
-      "name": "oozie_http_primary_name",
-      "displayName": "HTTP Primary name",
-      "value": "",
-      "defaultValue": "HTTP",
-      "description": "Primary name for spnego access for Oozie server",
-      "isReconfigurable": false,
-      "displayType": "principal",
-      "isVisible": true,
-      "isOverridable": false,
-      "serviceName": "OOZIE",
-      "category": "Oozie Server"
-    },
-    {
-      "id": "puppet var",
-      "name": "oozie_http_keytab",
-      "displayName": "Path to HTTP Keytab file",
-      "value": "",
-      "defaultValue": "/etc/security/keytabs/spnego.service.keytab",
-      "description": "Keytab for http Oozie server",
-      "displayType": "directory",
-      "isVisible": true,
-      "isOverridable": false,
-      "serviceName": "OOZIE",
-      "category": "Oozie Server"
-    },
-
-
-    //WEBHCAT
-    {
-      "id": "puppet var",
-      "name": "webhcat_http_primary_name",
-      "displayName": "HTTP Primary name",
-      "value": "",
-      "defaultValue": "HTTP",
-      "description": "Primary name for spnego access for webHCat",
-      "displayType": "principal",
-      "isReconfigurable": false,
-      "isVisible": true,
-      "isOverridable": false,
-      "serviceName": "WEBHCAT",
-      "category": "WebHCat"
-    },
-    {
-      "id": "puppet var",
-      "name": "webhcat_http_keytab",
-      "displayName": "Path to HTTP Keytab file",
-      "value": "",
-      "defaultValue": "/etc/security/keytabs/spnego.service.keytab",
-      "description": "Keytab for http webHCat",
-      "displayType": "directory",
-      "isVisible": true,
-      "isOverridable": false,
-      "serviceName": "WEBHCAT",
-      "category": "WebHCat"
-    },
-    //HUE
-
 
     //NAGIOS
     {
@@ -432,7 +373,7 @@ module.exports =
       "displayName": " Path to keytab file",
       "value": "",
       "defaultValue": "/etc/security/keytabs",
-      "description": "Keytab for nagios",
+      "description": "Path to the directory that contains nagios keytab",
       "displayType": "directory",
       "isVisible": true,
       "isOverridable": false,
@@ -461,7 +402,7 @@ module.exports =
       "displayName": "Path to keytab file",
       "value": "",
       "defaultValue": "/etc/security/keytabs/zk.service.keytab",
-      "description": "Keytab for ZooKeeper",
+      "description": "Path to ZooKeeper keytab file",
       "displayType": "directory",
       "isVisible": true,
       "isOverridable": false,