Repository: ambari Updated Branches: refs/heads/branch-2.1 60ae0778c -> 43251da19
AMBARI-13455. Ambari QE Deploy Test - Kerberos service check fails (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/43251da1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/43251da1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/43251da1 Branch: refs/heads/branch-2.1 Commit: 43251da1998cf1c321162448f30dca1276d71cb0 Parents: 60ae077 Author: Aleksandr Kovalenko <akovale...@hortonworks.com> Authored: Fri Oct 16 18:03:27 2015 +0300 Committer: Aleksandr Kovalenko <akovale...@hortonworks.com> Committed: Fri Oct 16 18:04:19 2015 +0300 ---------------------------------------------------------------------- .../main/admin/kerberos/wizard_controller.js | 22 ++++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/43251da1/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js index 2f15221..71095da 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js @@ -236,7 +236,13 @@ App.KerberosWizardController = App.WizardController.extend(App.InstallComponent, { type: 'sync', callback: function () { + var self = this; this.loadKerberosOption(); + if (App.get('supports.storeKDCCredentials')) { + credentialsUtils.isStorePersisted(App.get('clusterName')).then(function(isPersisted) { + self.set('content.secureStoragePersisted', isPersisted); + }); + } } } ], @@ -252,22 +258,6 @@ App.KerberosWizardController = App.WizardController.extend(App.InstallComponent, }, this); } } - }, - { - type: 'async', - callback: function() { - var self = this; - var dfd = $.Deferred(); - if (App.get('supports.storeKDCCredentials')) { - credentialsUtils.isStorePersisted(App.get('clusterName')).then(function(isPersisted) { - self.set('content.secureStoragePersisted', isPersisted); - dfd.resolve(); - }); - } else { - dfd.resolve(); - } - return dfd.promise(); - } } ], '3': [
