Repository: ambari Updated Branches: refs/heads/branch-2.2 8b620a3c3 -> 16ff8f30a
AMBARI-14884: Hawq standby host config should be removed on single node cluster during initial cluster installation (bhuvnesh2703 via jaoki) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/16ff8f30 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/16ff8f30 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/16ff8f30 Branch: refs/heads/branch-2.2 Commit: 16ff8f30a9108a904ebd656ebe7b162b6c3c258d Parents: 8b620a3 Author: Jun Aoki <ja...@apache.org> Authored: Wed Feb 3 15:41:31 2016 -0800 Committer: Jun Aoki <ja...@apache.org> Committed: Wed Feb 3 15:41:31 2016 -0800 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step7_controller.js | 3 ++- ambari-web/test/controllers/wizard/step7_test.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/16ff8f30/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index 4b27c76..a38222a 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -724,7 +724,8 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E } } } - if (App.get('isSingleNode')) this.removeHawqStandbyHostAddressConfig(configs); + // On single node cluster, update hawq configs + if (Object.keys(this.get('content.hosts')).length === 1) this.removeHawqStandbyHostAddressConfig(configs); var dependedServices = ["STORM", "YARN"]; dependedServices.forEach(function (serviceName) { if (this.get('allSelectedServiceNames').contains(serviceName)) { http://git-wip-us.apache.org/repos/asf/ambari/blob/16ff8f30/ambari-web/test/controllers/wizard/step7_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/wizard/step7_test.js b/ambari-web/test/controllers/wizard/step7_test.js index 408a43e..79f0202 100644 --- a/ambari-web/test/controllers/wizard/step7_test.js +++ b/ambari-web/test/controllers/wizard/step7_test.js @@ -1476,6 +1476,7 @@ describe('App.InstallerStep7Controller', function () { } } }); + installerStep7Controller.set('content.hosts', Em.A([{hostName: 'h1'}, {hostName: 'h2'}])); }); afterEach(function () { App.config.fileConfigsIntoTextarea.restore();
