AMBARI-3638. Reassign Master (secure setup) : RM reassignment should not have NN and ZK servers start command. (akovalenko)

ambari-web/app/controllers/main/service/reassign/step4_controller.js

@@ -69,10 +69,11 @@ App.ReassignMasterWizardStep4Controller = App.HighAvailabilityProgressPageContro
     }
 
     if (this.get('content.hasManualSteps')) {
-      if (App.HostComponent.find().someProperty('componentName', 'SECONDARY_NAMENODE')) {
-        this.get('tasks').splice(5, 4);
-      } else {
+      if (this.get('content.reassign.component_name') === 'NAMENODE' && !App.HostComponent.find().someProperty('componentName', 'SECONDARY_NAMENODE')) {
+        // Only for reassign NameNode with HA enabled
         this.get('tasks').splice(7, 2);
+      } else {
+        this.get('tasks').splice(5, 4);
       }
     } else {
       this.get('tasks').splice(5, 2);

ambari-web/test/controllers/main/service/reassign_controller_test.js

@@ -33,15 +33,4 @@ describe('App.ReassignMasterController', function () {
 
   reassignMasterController.set('content.reassign', {service_id:null});
 
-  describe('#skipStep3', function() {
-    it('should be TRUE for GANGLIA', function() {
-      reassignMasterController.set('content.reassign.service_id', 'GANGLIA');
-      expect(reassignMasterController.get('skipStep3')).to.equal(true);
-    });
-    it('should be FALSE for others', function() {
-      reassignMasterController.set('content.reassign.service_id', 'HDFS');
-      expect(reassignMasterController.get('skipStep3')).to.equal(false);
-    });
-  });
-
 });