소스 검색

AMBARI-12835. Error trying to enable kerberos after restart. Needed to reload browser. (alexantonenko)

Alex Antonenko 10 년 전
부모
커밋
593c0b2c9c

+ 6 - 0
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,

+ 12 - 23
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;

+ 0 - 2
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);