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/08/20 22:47:06 UTC
[2/2] ambari git commit: AMBARI-12835. Error trying to enable
kerberos after restart. Needed to reload browser. (alexantonenko)
AMBARI-12835. Error trying to enable kerberos after restart. Needed to reload browser. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/593c0b2c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/593c0b2c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/593c0b2c
Branch: refs/heads/trunk
Commit: 593c0b2c9cfce925ea05e9f2690bc50e93ae7433
Parents: 2b1a0f6
Author: Alex Antonenko <hi...@gmail.com>
Authored: Thu Aug 20 19:28:01 2015 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Thu Aug 20 23:46:55 2015 +0300
----------------------------------------------------------------------
.../main/admin/kerberos/step2_controller.js | 6 ++++
.../main/admin/kerberos/wizard_controller.js | 35 +++++++-------------
ambari-web/app/routes/add_kerberos_routes.js | 2 --
3 files changed, 18 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/593c0b2c/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
index 083e0c0..f87fb77 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
@@ -163,6 +163,12 @@ App.KerberosWizardStep2Controller = App.WizardStep7Controller.extend({
*/
deleteKerberosService: function () {
var serviceName = this.selectedServiceNames[0];
+ if (App.cache.services.someProperty('ServiceInfo.service_name', 'KERBEROS')) {
+ App.cache.services.removeAt(App.cache.services.indexOf(App.cache.services.findProperty('ServiceInfo.service_name', 'KERBEROS')));
+ }
+ if (App.Service.find().someProperty('serviceName', 'KERBEROS')) {
+ App.serviceMapper.deleteRecord(App.Service.find('KERBEROS'));
+ }
return App.ajax.send({
name: 'common.delete.service',
sender: this,
http://git-wip-us.apache.org/repos/asf/ambari/blob/593c0b2c/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 5096602..ed723cc 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
@@ -36,7 +36,18 @@ App.KerberosWizardController = App.WizardController.extend({
*/
hideBackButton: true,
- skipClientInstall: false,
+ /**
+ * Check if Kerberos Clients should be installed.
+ * Clients installation will be skipped if Manual Kerberization was selected.
+ *
+ * @type {Boolean}
+ */
+ skipClientInstall: function() {
+ if (this.get('content.kerberosOption')) {
+ return this.get('content.kerberosOption') === Em.I18n.t('admin.kerberos.wizard.step1.option.manual');
+ }
+ return false;
+ }.property('content.kerberosOption'),
kerberosDescriptorConfigs: null,
@@ -89,28 +100,6 @@ App.KerberosWizardController = App.WizardController.extend({
return jQuery.extend({}, this.get('clusterStatusTemplate'), {name: App.get('router').getClusterName()});
},
- /**
- * Gets the
- * @returns {*} jquery promise
- */
- getClusterEnvData: function () {
- var dfd = $.Deferred();
- var self = this;
- var siteName = 'cluster-env';
- var tags = [{siteName: siteName}];
- App.get('router.configurationController').getConfigsByTags(tags).done(function (data) {
- var properties = self.updateClusterEnvData(data[0].properties);
- var clusterConfig = {"type": siteName, "tag": 'version' + (new Date).getTime(), "properties": properties};
- var clusterConfigData = {
- Clusters: {
- desired_config: clusterConfig
- }
- };
- dfd.resolve(clusterConfigData);
- });
- return dfd;
- },
-
updateClusterEnvData: function (configs) {
var kerberosDescriptor = this.kerberosDescriptorConfigs;
configs['security_enabled'] = true;
http://git-wip-us.apache.org/repos/asf/ambari/blob/593c0b2c/ambari-web/app/routes/add_kerberos_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/add_kerberos_routes.js b/ambari-web/app/routes/add_kerberos_routes.js
index 716d738..55d1077 100644
--- a/ambari-web/app/routes/add_kerberos_routes.js
+++ b/ambari-web/app/routes/add_kerberos_routes.js
@@ -135,8 +135,6 @@ module.exports = App.WizardRoute.extend({
next: function (router) {
var kerberosWizardController = router.get('kerberosWizardController');
var kerberosStep1controller = router.get('kerberosWizardStep1Controller');
- var skipClientInstall = kerberosStep1controller.get('selectedOption.value') === Em.I18n.t('admin.kerberos.wizard.step1.option.manual');
- kerberosWizardController.set('skipClientInstall', skipClientInstall);
kerberosWizardController.saveKerberosOption(kerberosStep1controller);
kerberosWizardController.setDBProperty('serviceConfigProperties', null);