Repository: ambari Updated Branches: refs/heads/trunk 8793f44a7 -> 121924874
AMBARI-9875. Disable security fails (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/12192487 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/12192487 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/12192487 Branch: refs/heads/trunk Commit: 1219248741ef975bac3f851cbf7a410339cd44c3 Parents: f20500b Author: Alex Antonenko <[email protected]> Authored: Mon Mar 2 20:48:33 2015 +0200 Committer: Alex Antonenko <[email protected]> Committed: Mon Mar 2 21:18:25 2015 +0200 ---------------------------------------------------------------------- .../main/admin/kerberos/disable_controller.js | 15 +++++---------- ambari-web/app/messages.js | 5 +++-- 2 files changed, 8 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/12192487/ambari-web/app/controllers/main/admin/kerberos/disable_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/disable_controller.js b/ambari-web/app/controllers/main/admin/kerberos/disable_controller.js index 00a7da2..ff2bf86 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/disable_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/disable_controller.js @@ -24,7 +24,7 @@ App.KerberosDisableController = App.KerberosProgressPageController.extend({ name: 'kerberosDisableController', clusterDeployState: 'DEFAULT', - commands: ['stopServices', 'unkerberize', 'startServices'], + commands: ['stopServices', 'unkerberize', 'deleteKerberos', 'startServices'], tasksMessagesPrefix: 'admin.kerberos.disable.step', @@ -39,26 +39,19 @@ App.KerberosDisableController = App.KerberosProgressPageController.extend({ stopServices: function () { App.ajax.send({ name: 'common.services.update', + sender: this, data: { context: "Stop services", "ServiceInfo": { "state": "INSTALLED" } }, - sender: this, success: 'startPolling', error: 'onTaskError' }); }, unkerberize: function () { - var self = this; - this.deleteKerberos().always(function () { - self.reconfigureServices(); - }); - }, - - reconfigureServices: function () { return App.ajax.send({ name: 'admin.unkerberize.cluster', sender: this, @@ -73,7 +66,9 @@ App.KerberosDisableController = App.KerberosProgressPageController.extend({ sender: this, data: { serviceName: 'KERBEROS' - } + }, + success: 'onTaskCompleted', + error: 'onTaskCompleted' }); }, http://git-wip-us.apache.org/repos/asf/ambari/blob/12192487/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index d0c9ee9..947881c 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -983,8 +983,9 @@ Em.I18n.translations = { 'admin.kerberos.regenerate_keytabs.checkbox.label': ' Only regenerate keytabs for missing hosts and components', 'admin.kerberos.disable.step1.task0.title': 'Stop Services', - 'admin.kerberos.disable.step1.task1.title': 'Remove Kerberos', - 'admin.kerberos.disable.step1.task2.title': 'Start Services', + 'admin.kerberos.disable.step1.task1.title': 'Unkerberize Cluster', + 'admin.kerberos.disable.step1.task2.title': 'Remove Kerberos', + 'admin.kerberos.disable.step1.task3.title': 'Start Services', 'admin.kerberos.disable.unkerberize.header': 'Unkerberize cluster', 'admin.kerberos.disable.unkerberize.message': 'You cannot quit wizard while cluster is being unkerberized', 'admin.kerberos.disable.inProgress': 'Please wait while cluster is being unkerberized',
