You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2014/11/06 19:19:21 UTC

ambari git commit: AMBARI-8175. Security wizard: Cluster deployed with customized user fails to kerberize succesffully. (jaimin)

Repository: ambari
Updated Branches:
  refs/heads/branch-1.7.0 a7e1a3793 -> a7bc7350d


AMBARI-8175. Security wizard: Cluster deployed with customized user fails to kerberize succesffully. (jaimin)


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

Branch: refs/heads/branch-1.7.0
Commit: a7bc7350d49fef867419af3ac794619f3d1c05c2
Parents: a7e1a37
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Thu Nov 6 10:16:22 2014 -0800
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Thu Nov 6 10:16:33 2014 -0800

----------------------------------------------------------------------
 ambari-web/app/controllers/global/cluster_controller.js | 7 ++++++-
 ambari-web/app/controllers/main/admin/security.js       | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/a7bc7350/ambari-web/app/controllers/global/cluster_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js
index e6e4b03..ab1cb75 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -70,6 +70,12 @@ App.ClusterController = Em.Controller.extend({
     this.set('clusterDataLoadedPercent', 'width:' + (Math.floor(numLoaded / loadListLength * 100)).toString() + '%');
   },
 
+  doOnClusterLoad: function (item) {
+    if (this.get('isLoaded')) {
+      App.router.get('mainAdminSecurityController').getUpdatedSecurityStatus();
+    }
+  }.observes('isLoaded'),
+
   dataLoadList: Em.Object.create({
     'hosts': false,
     'serviceMetrics': false,
@@ -336,7 +342,6 @@ App.ClusterController = Em.Controller.extend({
         });
       });
     });
-    App.router.get('mainAdminSecurityController').getUpdatedSecurityStatus();
   },
 
   requestHosts: function (realUrl, callback) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7bc7350/ambari-web/app/controllers/main/admin/security.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/security.js b/ambari-web/app/controllers/main/admin/security.js
index 39eec54..0d4c031 100644
--- a/ambari-web/app/controllers/main/admin/security.js
+++ b/ambari-web/app/controllers/main/admin/security.js
@@ -83,6 +83,7 @@ App.MainAdminSecurityController = Em.Controller.extend({
     'hdfs_user': {defaultValue: 'hdfs', siteName: 'hadoop-env', serviceName: 'HDFS'},
     'yarn_user': {defaultValue: 'yarn', siteName: 'yarn-env', serviceName: 'YARN'},
     'mapred_user': {defaultValue: 'mapred', siteName: 'mapred-env', serviceName: 'MAPREDUCE'},
+    'mapred_user': {defaultValue: 'mapred', siteName: 'mapred-env', serviceName: 'MAPREDUCE2'},
     'hbase_user': {defaultValue: 'hbase', siteName: 'hbase-env', serviceName: 'HBASE'},
     'hive_user': {defaultValue: 'hive', siteName: 'hive-env', serviceName: 'HIVE'},
     'proxyuser_group': {defaultValue: 'users', siteName: 'hadoop-env', serviceName: 'HDFS'},