AMBARI-1152. Add Hosts wizard - Retry button does not trigger call to backend. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1431777 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -671,6 +671,9 @@ AMBARI-666 branch (unreleased changes)
 
   BUG FIXES
 
+  AMBARI-1152. Add Hosts wizard - Retry button does not trigger call to
+  backend. (yusaku)
+
   AMBARI-1104. Webhcat configuration not setting templeton-libjars.
   (Jaimin Jetly via yusaku)
 

ambari-web/app/controllers/wizard.js

@@ -248,7 +248,9 @@ App.WizardController = Em.Controller.extend({
       return;
     }
 
-    this.set('content.cluster.requestId', null);
+    // clear requests since we are installing services
+    // and we don't want to get tasks for previous install attempts
+    this.set('content.cluster.oldRequestsId', []);
 
     var self = this;
     var clusterName = this.get('content.cluster.name');

ambari-web/app/routes/add_host_routes.js

@@ -198,12 +198,11 @@ module.exports = Em.Route.extend({
     retry: function(router,context) {
       var addHostController = router.get('addHostController');
       var wizardStep9Controller = router.get('wizardStep9Controller');
-      if (!wizardStep9Controller.get('isSubmitDisabled')) {
-        if (wizardStep9Controller.get('content.cluster.status') !== 'START FAILED') {
-          addHostController.installServices(true);
+      if (wizardStep9Controller.get('showRetry')) {
+        if (wizardStep9Controller.get('content.cluster.status') === 'INSTALL FAILED') {
+          var isRetry = true;
+          addHostController.installServices(isRetry);
           addHostController.setInfoForStep9();
-        } else {
-          wizardStep9Controller.set('content.cluster.isCompleted', false);
         }
         wizardStep9Controller.navigateStep();
       }

ambari-web/app/routes/installer.js

@@ -281,7 +281,6 @@ module.exports = Em.Route.extend({
         localdb: App.db.data
       });
 
-
       router.transitionTo('step9');
     }
   }),