AMBARI-2239. secure cluster: Namenode and SNamenode should use same keytab. (jaimin)

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

CHANGES.txt

@@ -907,6 +907,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2239. secure cluster: Namenode and SNamenode should use same
+ keytab. (jaimin)
+
  AMBARI-2235. NN enters safe mode upon HDFS restart. (smohanty)
 
  AMBARI-2225. Security fixes with HBase service check. (jaimin)

ambari-web/app/data/secure_configs.js

@@ -40,7 +40,6 @@ module.exports = [
     configCategories: [
       App.ServiceConfigCategory.create({ name: 'General', displayName: 'General'}),
       App.ServiceConfigCategory.create({ name: 'NameNode', displayName: 'NameNode'}),
-      App.ServiceConfigCategory.create({ name: 'SNameNode',displayName: 'SNameNode'}),
       App.ServiceConfigCategory.create({ name: 'DataNode', displayName: 'DataNode'})
     ],
     sites: ['global', 'core-site', 'hdfs-site'],

ambari-web/app/data/secure_mapping.js

@@ -62,7 +62,7 @@ module.exports = [
   },
   {
     "name": "dfs.secondary.namenode.keytab.file",
-    "templateName": ["snamenode_keytab"],
+    "templateName": ["namenode_keytab"],
     "foreignKey": null,
     "value": "<templateName[0]>",
     "filename": "hdfs-site.xml"

ambari-web/app/data/secure_properties.js

@@ -149,19 +149,6 @@ module.exports =
       "serviceName": "HDFS",
       "category": "General"
     },
-    {
-      "id": "puppet var",
-      "name": "snamenode_keytab",
-      "displayName": "Path to keytab file",
-      "value": "",
-      "defaultValue": "/etc/security/keytabs/sn.service.keytab",
-      "description": "path to SecondaryNameNode keytab file",
-      "displayType": "directory",
-      "isVisible": true,
-      "isOverridable": false,
-      "serviceName": "HDFS",
-      "category": "SNameNode"
-    },
     {
       "id": "puppet var",
       "name": "dfs_datanode_address",