AMBARI-9641. Kerberos: Add Service -> Review page broken after kerberization. (yusaku)

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')) {

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();