Преглед изворни кода

AMBARI-18817. Add ability to Skip Host check option on bootstrap page. (jaimin)

Jaimin Jetly пре 8 година
родитељ
комит
b036bfaae4

+ 1 - 0
ambari-web/app/config.js

@@ -68,6 +68,7 @@ App.enableDigitalClock = false;
 App.enableExperimental = false;
 
 App.supports = {
+  disableHostCheckOnAddHostWizard: false,
   preUpgradeCheck: true,
   displayOlderVersions: false,
   autoRollbackHA: false,

+ 13 - 1
ambari-web/app/controllers/wizard/step3_controller.js

@@ -221,6 +221,13 @@ App.WizardStep3Controller = Em.Controller.extend(App.ReloadPopupMixin, {
    */
   checksUpdateStatus: null,
 
+  /**
+   * disables host check on Add host wizard as per the experimental flag
+   */
+  disableHostCheck: function () {
+    return App.get('supports.disableHostCheckOnAddHostWizard') && this.get('isAddHostWizard');
+  }.property('App.supports.disableHostCheckOnAddHostWizard', 'isAddHostWizard'),
+
   /**
    *
    * @method navigateStep
@@ -939,7 +946,12 @@ App.WizardStep3Controller = Em.Controller.extend(App.ReloadPopupMixin, {
       this.getHostCheckSuccess();
     } else {
       var data = this.getDataForCheckRequest("host_resolution_check", true);
-      data ? this.requestToPerformHostCheck(data) : this.stopHostCheck();
+      if (data && !this.get('disableHostCheck')) {
+        this.requestToPerformHostCheck(data);
+      } else {
+        this.stopHostCheck();
+        this.stopRegistration();
+      }
     }
   },
 

+ 10 - 8
ambari-web/app/templates/wizard/step3.hbs

@@ -138,15 +138,17 @@
       <a href="#" {{action registeredHostsPopup target="controller"}}>{{view.registeredHostsMessage}}</a>
     </div>
   {{/if}}
-  <div {{bindAttr class=":alert view.status isWarningsBoxVisible::hidden"}}>
-    {{view.message}}
-    <a href="#" {{action hostWarningsPopup warnings target="controller"}}>{{view.linkText}}</a>
-    {{#unless isBootstrapFailed}}
-      {{#unless isWarningsLoaded}}
-        {{view App.SpinnerView}}
+  {{#unless disableHostCheck}}
+    <div {{bindAttr class=":alert view.status isWarningsBoxVisible::hidden"}}>
+      {{view.message}}
+      <a href="#" {{action hostWarningsPopup warnings target="controller"}}>{{view.linkText}}</a>
+      {{#unless isBootstrapFailed}}
+        {{#unless isWarningsLoaded}}
+          {{view App.SpinnerView}}
+        {{/unless}}
       {{/unless}}
-    {{/unless}}
-  </div>
+    </div>
+  {{/unless}}
   <div class="btn-area">
     <button type="button" class="btn pull-left installer-back-btn" {{bindAttr disabled="isBackButtonDisabled"}} {{action back}}>
       &larr; {{t common.back}}