incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From onechipore...@apache.org
Subject git commit: AMBARI-3507. "Assign Slaves" step. Error with installed NodeManagers. (onechiporenko)
Date Mon, 14 Oct 2013 13:06:53 GMT
Updated Branches:
  refs/heads/trunk b8c835b55 -> 5366b1d70


AMBARI-3507. "Assign Slaves" step. Error with installed NodeManagers. (onechiporenko)


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

Branch: refs/heads/trunk
Commit: 5366b1d70b6da812a3a1ab3f2781268704b779a1
Parents: b8c835b
Author: Oleg Nechiporenko <cv_github@yahoo.com>
Authored: Mon Oct 14 16:02:01 2013 +0300
Committer: Oleg Nechiporenko <cv_github@yahoo.com>
Committed: Mon Oct 14 16:02:01 2013 +0300

----------------------------------------------------------------------
 .../app/controllers/main/service/add_controller.js      | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/5366b1d7/ambari-web/app/controllers/main/service/add_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/add_controller.js b/ambari-web/app/controllers/main/service/add_controller.js
index 770b1b7..92f0f05 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -201,11 +201,19 @@ App.AddServiceController = App.WizardController.extend({
     {
       name: 'TASKTRACKER',
       service: 'MAPREDUCE'
-    },{
+    },
+    {
       name: 'HBASE_REGIONSERVER',
       service: 'HBASE'
     }];
 
+    if (App.get('isHadoop2Stack')) {
+      components.push({
+        name: 'NODEMANAGER',
+        service: 'YARN'
+      });
+    }
+
     var result = [];
     var services = App.Service.find();
     var selectedServices = this.get('content.services').filterProperty('isSelected', true).mapProperty('serviceName');
@@ -260,7 +268,7 @@ App.AddServiceController = App.WizardController.extend({
       componentName: 'CLIENT',
       displayName: 'client',
       hosts: hosts
-    })
+    });
 
     return result;
   },


Mime
View raw message