AMBARI-6928. Remove the restriction for minimum one filesystem check. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9f7c878c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9f7c878c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9f7c878c Branch: refs/heads/branch-alerts-dev Commit: 9f7c878c91dcf26cf38548b2f4f4f2b3249fee56 Parents: be99b29 Author: Jaimin Jetly <jai...@hortonworks.com> Authored: Wed Aug 20 11:07:26 2014 -0700 Committer: Jaimin Jetly <jai...@hortonworks.com> Committed: Wed Aug 20 11:07:39 2014 -0700 ---------------------------------------------------------------------- .../app/controllers/wizard/step4_controller.js | 18 +----------------- ambari-web/app/models/stack_service.js | 6 ++++-- 2 files changed, 5 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7c878c/ambari-web/app/controllers/wizard/step4_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step4_controller.js b/ambari-web/app/controllers/wizard/step4_controller.js index b4742c2..22774d2 100644 --- a/ambari-web/app/controllers/wizard/step4_controller.js +++ b/ambari-web/app/controllers/wizard/step4_controller.js @@ -88,15 +88,6 @@ App.WizardStep4Controller = Em.ArrayController.extend({ }, /** - * Check whether we should turn on <code>HDFS or GLUSTERFS</code> service - * @return {bool} - * @method noDFSs - */ - noDFSs: function () { - return !this.filterProperty('isDFS',true).someProperty('isSelected',true); - }, - - /** * Check if multiple distributed file systems were selected * @return {bool} * @method multipleDFSs @@ -241,14 +232,7 @@ App.WizardStep4Controller = Em.ArrayController.extend({ var primaryDFS = this.findProperty('isPrimaryDFS',true); var primaryDfsDisplayName = primaryDFS.get('displayNameOnSelectServicePage'); var primaryDfsServiceName = primaryDFS.get('serviceName'); - if (this.noDFSs()) { - this.addValidationError({ - id: 'fsCheck', - callback: this.needToAddServicePopup, - callbackParams: [{serviceName: primaryDfsServiceName, selected: true},'fsCheck', primaryDfsDisplayName] - }); - } - else if (this.multipleDFSs()) { + if (this.multipleDFSs()) { var dfsServices = this.filterProperty('isDFS',true).filterProperty('isSelected',true).mapProperty('serviceName'); var services = dfsServices.map(function (item){ return { http://git-wip-us.apache.org/repos/asf/ambari/blob/9f7c878c/ambari-web/app/models/stack_service.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js index 0b489f8..e5535eb 100644 --- a/ambari-web/app/models/stack_service.js +++ b/ambari-web/app/models/stack_service.js @@ -228,14 +228,16 @@ App.StackService.displayOrder = [ App.StackService.dependency = { 'HDP-1': { + 'HDFS': ['MAPREDUCE', 'HBASE', 'SQOOP'], 'MAPREDUCE': ['PIG', 'OOZIE', 'HIVE'], 'ZOOKEEPER': ['HBASE', 'HIVE', 'WEBHCAT'] }, 'HDP-2': { + 'ZOOKEEPER': ['HDFS', 'HBASE', 'HIVE', 'WEBHCAT', 'STORM'], + 'HDFS': ['YARN', 'HBASE', 'FLUME', 'SQOOP'], 'YARN': ['PIG', 'OOZIE', 'HIVE', 'TEZ'], 'TEZ': ['YARN'], - 'OOZIE': ['FALCON'], - 'ZOOKEEPER': ['HDFS', 'HBASE', 'HIVE', 'WEBHCAT', 'STORM'] + 'OOZIE': ['FALCON'] } };