Repository: ambari Updated Branches: refs/heads/branch-2.2 b75cc8d3a -> d5412a54f
AMBARI-15008. Use force_toggle_kerberos directive when retrying enable Kerberos on failure (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d5412a54 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d5412a54 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d5412a54 Branch: refs/heads/branch-2.2 Commit: d5412a54f6b2e153ed0a12f88d4428a5ca13bc81 Parents: b75cc8d Author: Alex Antonenko <hiv...@gmail.com> Authored: Thu Feb 11 12:01:22 2016 +0200 Committer: Alex Antonenko <hiv...@gmail.com> Committed: Fri Feb 12 15:46:15 2016 +0200 ---------------------------------------------------------------------- .../main/admin/kerberos/step7_controller.js | 12 ++++++------ ambari-web/app/utils/ajax/ajax.js | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d5412a54/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js index 71e94ca..2a4fb90 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/step7_controller.js @@ -48,13 +48,13 @@ App.KerberosWizardStep7Controller = App.KerberosProgressPageController.extend({ } }; if (isRetry) { - // on retry we have to unkerberize cluster - this.unkerberizeCluster().always(function() { - // clear current request object before start of kerberize process - self.set('request', kerberizeRequest); - self.clearStage(); - self.loadStep(); + // on retry send force update + self.set('request', { + name: 'KERBERIZE_CLUSTER', + ajaxName: 'admin.kerberize.cluster.force' }); + self.clearStage(); + self.loadStep(); } else { this.set('request', kerberizeRequest); } http://git-wip-us.apache.org/repos/asf/ambari/blob/d5412a54/ambari-web/app/utils/ajax/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js index 04157b5..4456268 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/ambari-web/app/utils/ajax/ajax.js @@ -1461,6 +1461,21 @@ var urls = { } }, + 'admin.kerberize.cluster.force': { + 'type': 'PUT', + 'real': '/clusters/{clusterName}?force_toggle_kerberos=true', + 'mock': '/data/wizard/kerberos/kerberize_cluster.json', + 'format': function (data) { + return { + data: JSON.stringify({ + Clusters: { + security_type: "KERBEROS" + } + }) + } + } + }, + 'admin.unkerberize.cluster.skip': { 'type': 'PUT', 'real': '/clusters/{clusterName}?manage_kerberos_identities=false',