Browse Source

AMBARI-4451 Storm: Add Custom storm.yaml section in Configs. (Denys Buzhor via atkach)

atkach 11 years ago
parent
commit
2b0ced0d49

+ 1 - 1
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'));
     }

+ 2 - 1
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: []