ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject ambari git commit: AMBARI-9648 Kerberos: attempting to add host to kerberos cluster fails. (ababiichuk)
Date Sun, 15 Feb 2015 13:10:22 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 97eac81b0 -> 8a708f783


AMBARI-9648 Kerberos: attempting to add host to kerberos cluster fails.  (ababiichuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8a708f78
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8a708f78
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8a708f78

Branch: refs/heads/trunk
Commit: 8a708f7830c8525444e930cc670f3de4d2356a41
Parents: 97eac81
Author: aBabiichuk <ababiichuk@cybervisiontech.com>
Authored: Sun Feb 15 14:42:19 2015 +0200
Committer: aBabiichuk <ababiichuk@cybervisiontech.com>
Committed: Sun Feb 15 14:42:19 2015 +0200

----------------------------------------------------------------------
 .../app/controllers/wizard/step8_controller.js     |  9 +--------
 ambari-web/app/messages.js                         |  3 ---
 ambari-web/app/templates/wizard/step8.hbs          |  8 +-------
 ambari-web/test/controllers/wizard/step8_test.js   | 17 +----------------
 4 files changed, 3 insertions(+), 34 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8a708f78/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index 66429c2..2acb762 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -843,14 +843,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs,
App.wiz
    */
   submit: function () {
     if (this.get('isSubmitDisabled')) return null;
-    if ((this.get('content.controllerName') == 'addHostController') && this.get('securityEnabled'))
{
-      var self = this;
-      return App.showConfirmationPopup(function () {
-        self.submitProceed();
-      }, Em.I18n.t('installer.step8.securityConfirmationPopupBody'));
-    } else {
-      return this.submitProceed();
-    }
+    return this.submitProceed();
   },
   /**
    * Update configurations for installed services.

http://git-wip-us.apache.org/repos/asf/ambari/blob/8a708f78/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 1ef0e55..50afd8b 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -735,9 +735,6 @@ Em.I18n.translations = {
   'installer.step8.repoInfo.osType.redhat5':'RHEL 5/CentOS 5/Oracle Linux 5',
   'installer.step8.repoInfo.osType.sles11':'SLES 11/SUSE 11',
   'installer.step8.repoInfo.displayName':'Repositories',
-  'installer.step8.securityWarning':'You are running your cluster in secure mode. You must
set up the keytabs for all the hosts you are adding before you proceed.',
-  'installer.step8.securityConfirmationPopupBody':'Before you proceed, please make sure that
the keytabs have been set up on the hosts you are adding per the instructions on the Review
page. Otherwise, the assigned components will not be able to start properly on the hosts being
added.',
-
   'installer.step9.header':'Install, Start and Test',
   'installer.step9.body':'Please wait while the selected services are installed and started.',
   'installer.step9.status.success':'Successfully installed and started the services.',

http://git-wip-us.apache.org/repos/asf/ambari/blob/8a708f78/ambari-web/app/templates/wizard/step8.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/wizard/step8.hbs b/ambari-web/app/templates/wizard/step8.hbs
index 2a0f50e..8506371 100644
--- a/ambari-web/app/templates/wizard/step8.hbs
+++ b/ambari-web/app/templates/wizard/step8.hbs
@@ -22,12 +22,6 @@
     {{t installer.step8.body}}
   </div>
 
-  {{#if controller.securityEnabled}}
-    <div class="alert alert-error">
-      {{t installer.step8.securityWarning}}
-    </div>
-  {{/if}}
-
   <div id="step8-content" class="well pre-scrollable">
     <div id="step8-info">
       {{#each item in controller.clusterInfo}}
@@ -75,4 +69,4 @@
        id="spinner" {{bindAttr disabled="controller.isSubmitDisabled"}} {{action submit target="controller"}}>{{t
common.deploy}} &rarr;</a>
     <a class="btn btn-info pull-right" {{action printReview target="view"}}>{{t common.print}}</a>
   </div>
-</div>
\ No newline at end of file
+</div>

http://git-wip-us.apache.org/repos/asf/ambari/blob/8a708f78/ambari-web/test/controllers/wizard/step8_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/wizard/step8_test.js b/ambari-web/test/controllers/wizard/step8_test.js
index f95c173..4c89ed6 100644
--- a/ambari-web/test/controllers/wizard/step8_test.js
+++ b/ambari-web/test/controllers/wizard/step8_test.js
@@ -750,16 +750,6 @@ describe('App.WizardStep8Controller', function () {
     });
     Em.A([
         {
-          controllerName: 'addHostController',
-          securityEnabled: true,
-          e: true
-        },
-        {
-          controllerName: 'addHostController',
-          securityEnabled: false,
-          e: false
-        },
-        {
           controllerName: 'addServiceController',
           securityEnabled: true,
           e: false
@@ -783,11 +773,6 @@ describe('App.WizardStep8Controller', function () {
           }
         });
       });
-    it('should call submitProceed when Ok clicked', function() {
-      installerStep8Controller.reopen({isSubmitDisabled: false, securityEnabled: true, content:
{controllerName: 'addHostController'}});
-      installerStep8Controller.submit().onPrimary();
-      expect(installerStep8Controller.submitProceed.calledOnce).to.equal(true);
-    });
     it('shouldn\'t do nothing if isSubmitDisabled is true', function() {
       installerStep8Controller.reopen({isSubmitDisabled: true});
       installerStep8Controller.submit();
@@ -1747,4 +1732,4 @@ describe('App.WizardStep8Controller', function () {
 
   });
 
-});
\ No newline at end of file
+});


Mime
View raw message