ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject [2/2] ambari git commit: AMBARI-9679. Customization of user account for running Ambari Agent doesn't work (alexantonenko)
Date Tue, 17 Feb 2015 18:32:23 GMT
AMBARI-9679. Customization of user account for running Ambari Agent doesn't work (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 86d8bbc440cdb3cb8448dd165fc50f46605f9318
Parents: 90d7b53
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Tue Feb 17 18:51:16 2015 +0200
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Tue Feb 17 20:17:44 2015 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step3_controller.js |  2 +-
 ambari-web/test/controllers/wizard/step3_test.js      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/86d8bbc4/ambari-web/app/controllers/wizard/step3_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js b/ambari-web/app/controllers/wizard/step3_controller.js
index df08181..a89268b 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -217,7 +217,7 @@ App.WizardStep3Controller = Em.Controller.extend({
         'sshKey': this.get('content.installOptions.sshKey'),
         'hosts': Em.keys(this.get('content.hosts')),
         'user': this.get('content.installOptions.sshUser'),
-        'userRunAs': App.get('supports.customizeAgentUserAccount') ? this.get('agentUser')
: 'root'
+        'userRunAs': App.get('supports.customizeAgentUserAccount') ? this.get('content.installOptions.agentUser')
: 'root'
     });
     App.router.get(this.get('content.controllerName')).launchBootstrap(bootStrapData, function
(requestId) {
       if (requestId == '0') {

http://git-wip-us.apache.org/repos/asf/ambari/blob/86d8bbc4/ambari-web/test/controllers/wizard/step3_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step3_test.js b/ambari-web/test/controllers/wizard/step3_test.js
index 06887a4..38494ba 100644
--- a/ambari-web/test/controllers/wizard/step3_test.js
+++ b/ambari-web/test/controllers/wizard/step3_test.js
@@ -557,11 +557,11 @@ describe('App.WizardStep3Controller', function () {
           content: {
             installOptions: {
               sshKey: 'key',
-              sshUser: 'root'
+              sshUser: 'root',
+              agentUser: 'user'
             },
             hosts: { "host0": { "name": "host0" }, "host1": { "name": "host1" } }
-          },
-          agentUser: 'user'
+          }
         });
         sinon.stub(App, 'get').withArgs('supports.customizeAgentUserAccount').returns(item.customizeAgentUserAccount);
         controller.setupBootStrap();
@@ -1977,12 +1977,12 @@ describe('App.WizardStep3Controller', function () {
         content: {
           installOptions: {
             sshKey: 'key',
-            sshUser: 'root'
+            sshUser: 'root',
+            agentUser: 'user'
           },
           hosts: { "host0": { "name": "host0" }, "host1": { "name": "host1" } },
           controllerName: 'installerController'
-        },
-        agentUser: 'user'
+        }
       });
 
     beforeEach(function () {


Mime
View raw message