Browse Source

AMBARI-11115. KMS properties are not getting set on the hdfs-site.xml and core-site.xml during adding ranger-kms service (ababiichuk via srimanth)

Srimanth Gunturi 10 years ago
parent
commit
1db9471e78

+ 2 - 1
ambari-web/app/controllers/wizard/step8_controller.js

@@ -860,7 +860,8 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
     var configs = this.get('configs').slice(0);
     var configsMap = [];
     fileNamesToUpdate.forEach(function (fileName) {
-      if (!fileName || /^(core)/.test(fileName)) return;
+      // TODO - Temporarily commented out before refactoring should clean it more properly
+      // if (!fileName || /^(core)/.test(fileName)) return;
       var tagName = 'version' + (new Date).getTime();
       var configsToSave = configs.filterProperty('filename', fileName);
       configsToSave.forEach(function (item) {

+ 4 - 1
ambari-web/app/mixins/common/configs/enhanced_configs.js

@@ -570,7 +570,8 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
             serviceName: stepConfigs.get('serviceName'),
             filename: App.config.getOriginalFileName(Em.get(propertyToAdd, 'fileName')),
             isNotSaved: !Em.get(propertyToAdd, 'isDeleted'),
-            isRequired: true
+            isRequired: true,
+            forceUpdate: true
           });
           stepConfigs.get('configs').pushObject(addedProperty);
           addedProperty.validate();
@@ -649,9 +650,11 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
           var valueToSave = propertyToUpdate.saveRecommended ? propertyToUpdate.recommendedValue : propertyToUpdate.value;
           if (!selectedGroup || selectedGroup.get('isDefault')) {
             cp.set('value', valueToSave);
+            cp.set('forceUpdate', true);
           } else {
             if (stepConfigs.get('serviceName') !== this.get('content.serviceName')) {
               cp.set('value', cp.get('defaultValue'));
+              cp.set('forceUpdate', true);
             }
             var overriddenConfig = cp.get('overrides') && cp.get('overrides').findProperty('group.name', selectedGroup.get('name'));
             if (overriddenConfig) {

+ 1 - 0
ambari-web/app/models/configs/objects/service_config_property.js

@@ -84,6 +84,7 @@ App.ServiceConfigProperty = Em.Object.extend({
   rowStyleClass: null, // CSS-Class to be applied on the row showing this config
   showAsTextBox: false,
 
+  forceUpdate: false,
   /**
    * value that is returned from server as recommended
    * @type {String}

+ 1 - 0
ambari-web/app/utils/config.js

@@ -735,6 +735,7 @@ App.config = Em.Object.create({
             config.set('value', defaults[name]);
             config.set('defaultValue', defaults[name]);
             config.set('recommendedValue', defaults[name]);
+            config.set('forceUpdate', true);
           }
         });
       }