You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2015/03/02 20:23:01 UTC
ambari git commit: AMBARI-9875. Disable security fails (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 f5c7ac418 -> 7bf692d93
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/7bf692d9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7bf692d9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7bf692d9
Branch: refs/heads/branch-2.0.0
Commit: 7bf692d93013236c4ee6c3c6bcaded41e40a6349
Parents: f5c7ac4
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Mar 2 20:48:33 2015 +0200
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Mar 2 21:21:30 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/7bf692d9/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/7bf692d9/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index ce59d33..97adb7a 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',