[1/3] AMBARI-7570. Add Storm Kerberos Support.

[swagle]

Repository: ambari
Updated Branches:
  refs/heads/trunk 1acb73958 -> 73c169e32


http://git-wip-us.apache.org/repos/asf/ambari/blob/73c169e3/ambari-web/app/mixins/wizard/addSecurityConfigs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/wizard/addSecurityConfigs.js 
b/ambari-web/app/mixins/wizard/addSecurityConfigs.js
index d3b527a..1defe9c 100644
--- a/ambari-web/app/mixins/wizard/addSecurityConfigs.js
+++ b/ambari-web/app/mixins/wizard/addSecurityConfigs.js
@@ -82,20 +82,29 @@ App.AddSecurityConfigs = Em.Mixin.create({
   /**
    * security configs, which values should be modified after APPLY 
CONFIGURATIONS stage
    */
-  secureConfigs: [
-    {
-      name: 'nagios_principal_name',
-      serviceName: 'NAGIOS'
-    },
-    {
-      name: 'zookeeper_principal_name',
-      serviceName: 'ZOOKEEPER'
-    },
-    {
-      name: 'storm_principal_name',
-      serviceName: 'STORM'
+  secureConfigs: function () {
+    var configs = [
+      {
+        name: 'nagios_principal_name',
+        serviceName: 'NAGIOS'
+      },
+      {
+        name: 'zookeeper_principal_name',
+        serviceName: 'ZOOKEEPER'
+      },
+      {
+        name: 'storm_principal_name',
+        serviceName: 'STORM'
+      }
+    ];
+    if (App.get('isHadoop22Stack')) {
+      configs.push({
+        name: 'nimbus_principal_name',
+        serviceName: 'STORM'
+      })
     }
-  ],
+    return configs;
+  }.property('App.isHadoop22Stack'),
 
   secureServices: function() {
     return  this.get('content.services');

http://git-wip-us.apache.org/repos/asf/ambari/blob/73c169e3/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index c0eb1c3..7baf180 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -92,11 +92,13 @@ App.config = Em.Object.create({
   }.property('App.isHadoop2Stack'),
 
   preDefinedSiteProperties: function () {
-    if (App.get('isHadoop2Stack')) {
+    if (App.get('isHadoop22Stack')) {
+      return require('data/HDP2.2/site_properties').configProperties;
+    } else if (App.get('isHadoop2Stack')) {
       return require('data/HDP2/site_properties').configProperties;
     }
     return require('data/site_properties').configProperties;
-  }.property('App.isHadoop2Stack'),
+  }.property('App.isHadoop2Stack', 'App.isHadoop22Stack'),
 
   preDefinedCustomConfigs: function () {
     if (App.get('isHadoop2Stack')) {