incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jai...@apache.org
Subject git commit: AMBARI-3292: Security wizard: On NameNode HA mode, General category should have spnego principal and keytab field. (jaimin)
Date Thu, 19 Sep 2013 20:24:40 GMT
Updated Branches:
  refs/heads/trunk 632ebf74f -> 787cd36f4


AMBARI-3292: Security wizard: On NameNode HA mode, General category should have spnego principal
and keytab field. (jaimin)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/787cd36f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/787cd36f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/787cd36f

Branch: refs/heads/trunk
Commit: 787cd36f4eed1930616061a38c91da16fe85c14c
Parents: 632ebf7
Author: Jaimin Jetly <jaimin@hortonworks.com>
Authored: Thu Sep 19 13:24:16 2013 -0700
Committer: Jaimin Jetly <jaimin@hortonworks.com>
Committed: Thu Sep 19 13:24:22 2013 -0700

----------------------------------------------------------------------
 .../main/admin/security/add/step2.js            | 35 ++++++--------------
 ambari-web/app/data/HDP2/secure_mapping.js      |  2 +-
 ambari-web/app/data/HDP2/secure_properties.js   | 15 +--------
 3 files changed, 13 insertions(+), 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/787cd36f/ambari-web/app/controllers/main/admin/security/add/step2.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/security/add/step2.js b/ambari-web/app/controllers/main/admin/security/add/step2.js
index c271001..9efb79a 100644
--- a/ambari-web/app/controllers/main/admin/security/add/step2.js
+++ b/ambari-web/app/controllers/main/admin/security/add/step2.js
@@ -268,35 +268,22 @@ App.MainAdminSecurityAddStep2Controller = Em.Controller.extend({
   changeCategoryOnHa: function (serviceConfigs, stepConfigs) {
     var hdfsService = serviceConfigs.findProperty('serviceName', 'HDFS');
     if (hdfsService) {
-      var hdfsProperties = stepConfigs.findProperty('serviceName','HDFS').get('configs');
+      var hdfsProperties = stepConfigs.findProperty('serviceName', 'HDFS').get('configs');
       var configCategories = hdfsService.configCategories;
-      var dfsHttpPrincipal = hdfsProperties.findProperty('name', 'hadoop_http_principal_name');
-      var dfsHttpKeytab = hdfsProperties.findProperty('name', 'hadoop_http_keytab');
       if ((App.testMode && App.testNameNodeHA) || (this.get('content.isNnHa') ===
'true')) {
-        if (dfsHttpPrincipal && dfsHttpKeytab) {
-          dfsHttpPrincipal.set('category','NameNode');
-          dfsHttpKeytab.set('category','NameNode');
-        } else {
-          dfsHttpPrincipal.set('category','General');
-          dfsHttpKeytab.set('category','General');
-        }
-        hdfsProperties.filterProperty('category','SNameNode').forEach(function(_snConfig){
-          _snConfig.set('isVisible',false);
-        },this);
-        var generalCategory = configCategories.findProperty('name','General');
-        var snCategory = configCategories.findProperty('name','SNameNode');
-        if(generalCategory) {
-          configCategories.removeObject(generalCategory);
-        }
-        if(snCategory) {
+        hdfsProperties.filterProperty('category', 'SNameNode').forEach(function (_snConfig)
{
+          _snConfig.set('isVisible', false);
+        }, this);
+        var snCategory = configCategories.findProperty('name', 'SNameNode');
+        if (snCategory) {
           configCategories.removeObject(snCategory);
         }
       } else {
-        hdfsProperties.filterProperty('category','JournalNode').forEach(function(_jnConfig){
-          _jnConfig.set('isVisible',false);
-        },this);
-        var jnCategory = configCategories.findProperty('name','JournalNode');
-        if(jnCategory) {
+        hdfsProperties.filterProperty('category', 'JournalNode').forEach(function (_jnConfig)
{
+          _jnConfig.set('isVisible', false);
+        }, this);
+        var jnCategory = configCategories.findProperty('name', 'JournalNode');
+        if (jnCategory) {
           configCategories.removeObject(jnCategory);
         }
       }

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/787cd36f/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 25ba838..6d67d58 100644
--- a/ambari-web/app/data/HDP2/secure_mapping.js
+++ b/ambari-web/app/data/HDP2/secure_mapping.js
@@ -131,7 +131,7 @@ module.exports = [
   },
   {
     "name": "dfs.journalnode.kerberos.internal.spnego.principal",
-    "templateName": ["journalnode_http_principal_name", "kerberos_domain"],
+    "templateName": ["hadoop_http_principal_name", "kerberos_domain"],
     "foreignKey": null,
     "value": "<templateName[0]>@<templateName[1]>",
     "filename": "hdfs-site.xml",

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/787cd36f/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 0ae330b..2f32f38 100644
--- a/ambari-web/app/data/HDP2/secure_properties.js
+++ b/ambari-web/app/data/HDP2/secure_properties.js
@@ -275,19 +275,6 @@ module.exports =
     },
     {
       "id": "puppet var",
-      "name": "journalnode_http_principal_name",
-      "displayName": "Web principal name",
-      "value": "",
-      "defaultValue": "HTTP/_HOST",
-      "description": "Principal name for SPNEGO access for JournalNode. _HOST will get automatically
replaced with actual hostname at instance of JournalNode",
-      "displayType": "principal",
-      "isVisible": false,
-      "isOverridable": false,
-      "serviceName": "HDFS",
-      "category": "JournalNode"
-    },
-    {
-      "id": "puppet var",
       "name": "journalnode_keytab",
       "displayName": "Path to keytab file",
       "value": "",
@@ -373,7 +360,7 @@ module.exports =
       "displayName": "DFS web principal name",
       "value": "",
       "defaultValue": "HTTP/_HOST",
-      "description": "Principal name for SPNEGO access for NameNode and SNameNode. _HOST
will get automatically replaced with actual hostname at instance of NameNode and SNameNode",
+      "description": "Principal name for SPNEGO access for HDFS components. _HOST will get
automatically replaced with actual hostname at instance of HDFS component",
       "displayType": "principal",
       "isVisible": true,
       "isOverridable": false,


Mime
View raw message