Repository: ambari Updated Branches: refs/heads/trunk da7acb02d -> 182b34732
AMBARI-9641. Kerberos: Add Service -> Review page broken after kerberization. (yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/182b3473 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/182b3473 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/182b3473 Branch: refs/heads/trunk Commit: 182b34732350e4a515950bc3667d3824bbd7f15a Parents: da7acb0 Author: Yusaku Sako <yus...@hortonworks.com> Authored: Fri Feb 13 18:02:57 2015 -0800 Committer: Yusaku Sako <yus...@hortonworks.com> Committed: Fri Feb 13 18:02:57 2015 -0800 ---------------------------------------------------------------------- ambari-web/app/controllers/wizard/step7_controller.js | 7 ------- ambari-web/app/controllers/wizard/step8_controller.js | 10 ---------- 2 files changed, 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/182b3473/ambari-web/app/controllers/wizard/step7_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step7_controller.js b/ambari-web/app/controllers/wizard/step7_controller.js index b0d8463..d910059 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -664,18 +664,11 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, { this.get('selectedServiceNames').forEach(function (serviceName) { if (!serviceConfigs.findProperty('serviceName', serviceName)) return; var selectedService = serviceConfigs.findProperty('serviceName', serviceName).set('selected', true); - // add secure configs when security is enabled - if (this.get('securityEnabled')) { - this.addSecureConfigs(selectedService, serviceName); - } }, this); this.get('installedServiceNames').forEach(function (serviceName) { var serviceConfigObj = serviceConfigs.findProperty('serviceName', serviceName); var isInstallableService = App.StackService.find(serviceName).get('isInstallable'); if (!isInstallableService) serviceConfigObj.set('showConfig', false); - if (this.get('securityEnabled')) { - this.setSecureConfigs(serviceConfigObj, serviceName); - } }, this); // if HA is enabled -> Remove SNameNode, hbase.rootdir should use Name Service ID if (App.get('isHaEnabled')) { http://git-wip-us.apache.org/repos/asf/ambari/blob/182b3473/ambari-web/app/controllers/wizard/step8_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js index c3efff1..66429c2 100644 --- a/ambari-web/app/controllers/wizard/step8_controller.js +++ b/ambari-web/app/controllers/wizard/step8_controller.js @@ -215,16 +215,6 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz if (this.get('content.serviceConfigProperties')) { this.formatProperties(); this.loadConfigs(); - if (this.get('content.controllerName') != 'installerController' && this.get('securityEnabled')) { - this.prepareSecureConfigs(); - this.get('content.services').filterProperty('isSelected', true) - .mapProperty('serviceName').forEach(function (serviceName) { - var config = this.get('secureConfigs').findProperty('serviceName', serviceName); - if (config) { - this.setPrincipalValue(serviceName, config.name); - } - }, this); - } } this.loadClusterInfo(); this.loadServices();
