You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2014/01/29 11:29:16 UTC
git commit: AMBARI-4451 Storm: Add Custom storm.yaml section in
Configs. (Denys Buzhor via atkach)
Updated Branches:
refs/heads/trunk 8017fec53 -> 2b0ced0d4
AMBARI-4451 Storm: Add Custom storm.yaml section in Configs. (Denys Buzhor via atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2b0ced0d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2b0ced0d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2b0ced0d
Branch: refs/heads/trunk
Commit: 2b0ced0d49a178924ecb07ad4c6984d37dff5827
Parents: 8017fec
Author: atkach <at...@hortonworks.com>
Authored: Wed Jan 29 12:29:11 2014 +0200
Committer: atkach <at...@hortonworks.com>
Committed: Wed Jan 29 12:29:11 2014 +0200
----------------------------------------------------------------------
ambari-web/app/controllers/main/service/add_controller.js | 2 +-
ambari-web/app/data/service_configs.js | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b0ced0d/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 b9a39d2..325a520 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -131,7 +131,7 @@ App.AddServiceController = App.WizardController.extend({
var serviceNames = servicesInfo.filterProperty('isSelected', true).filterProperty('isDisabled', false).mapProperty('serviceName');
console.log('selected services ', serviceNames);
- this.set('content.skipSlavesStep', !serviceNames.contains('MAPREDUCE') && !serviceNames.contains('HBASE'));
+ this.set('content.skipSlavesStep', !serviceNames.contains('MAPREDUCE') && !serviceNames.contains('HBASE') && !serviceNames.contains('STORM') && !serviceNames.contains('YARN'));
if (this.get('content.skipSlavesStep')) {
this.get('isStepDisabled').findProperty('step', 3).set('value', this.get('content.skipSlavesStep'));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2b0ced0d/ambari-web/app/data/service_configs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/service_configs.js b/ambari-web/app/data/service_configs.js
index 081abba..6520125 100644
--- a/ambari-web/app/data/service_configs.js
+++ b/ambari-web/app/data/service_configs.js
@@ -243,7 +243,8 @@ module.exports = [
App.ServiceConfigCategory.create({ name: 'DRPCServer', displayName : 'DRPC Server'}),
App.ServiceConfigCategory.create({ name: 'LogviewerServer', displayName : 'Logviewer Server'}),
App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}),
- App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'})
+ App.ServiceConfigCategory.create({ name: 'Advanced', displayName : 'Advanced'}),
+ App.ServiceConfigCategory.create({ name: 'AdvancedStormSite', displayName : 'Custom storm.yaml', siteFileName: 'storm-site.xml', canAddProperty: true})
],
sites: ['global', 'storm-site'],
configs: []