Repository: ambari Updated Branches: refs/heads/trunk 53ab860fc -> 4d13432f1
AMBARI-14174 Add Ranger KMS: Other services are incorrectly reconfigured. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4d13432f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d13432f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d13432f Branch: refs/heads/trunk Commit: 4d13432f14456037f980416698cb406e372cfbc3 Parents: 53ab860 Author: Andrii Tkach <atk...@hortonworks.com> Authored: Thu Dec 3 12:16:48 2015 +0200 Committer: Andrii Tkach <atk...@hortonworks.com> Committed: Thu Dec 3 12:16:48 2015 +0200 ---------------------------------------------------------------------- .../HDP/2.2/services/TEZ/configuration/tez-site.xml | 5 +++++ ambari-web/app/controllers/wizard/step7_controller.js | 1 - .../app/mixins/common/configs/enhanced_configs.js | 2 +- ambari-web/test/controllers/wizard/step7_test.js | 14 -------------- 4 files changed, 6 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4d13432f/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml index 3a04f70..ec6d563 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml @@ -354,4 +354,9 @@ </description> </property> + <property> + <name>tez.tez-ui.history-url.base</name> + <description></description> + </property> + </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/4d13432f/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 3343c29..bb366d7 100644 --- a/ambari-web/app/controllers/wizard/step7_controller.js +++ b/ambari-web/app/controllers/wizard/step7_controller.js @@ -721,7 +721,6 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E if (this.get('wizardController.name') == 'addServiceController') { // for Add Service just remove or add dependent properties and ignore config values changes // for installed services only - this.addRemoveDependentConfigs(this.get('installedServiceNames')); this.clearDependenciesForInstalledServices(this.get('installedServiceNames'), this.get('stepConfigs')); } // * add dependencies based on recommendations http://git-wip-us.apache.org/repos/asf/ambari/blob/4d13432f/ambari-web/app/mixins/common/configs/enhanced_configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js index 96916d0..7b16b55 100644 --- a/ambari-web/app/mixins/common/configs/enhanced_configs.js +++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js @@ -183,7 +183,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({ return p && p.concat(c); }); var cleanDependencies = this.get('_dependentConfigValues').reject(function(item) { - if ('hadoop.proxyuser'.contains(Em.get(item, 'name'))) return false; + if (Em.get(item, 'propertyName').contains('hadoop.proxyuser')) return false; if (installedServices.contains(Em.get(item, 'serviceName'))) { var stackProperty = App.configsCollection.getConfigByName(item.propertyName, item.fileName); var parentConfigs = stackProperty && stackProperty.propertyDependsOn; http://git-wip-us.apache.org/repos/asf/ambari/blob/4d13432f/ambari-web/test/controllers/wizard/step7_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/wizard/step7_test.js b/ambari-web/test/controllers/wizard/step7_test.js index cf6f051..5efa0e3 100644 --- a/ambari-web/test/controllers/wizard/step7_test.js +++ b/ambari-web/test/controllers/wizard/step7_test.js @@ -1260,20 +1260,6 @@ describe('App.InstallerStep7Controller', function () { var controller = App.WizardStep7Controller.create({ installedServiceNames: ['HBASE', 'AMBARI_METRICS'] }), - serviceConfigTags = [ - { - siteName: 'hbase-site', - tagName: 'version1' - }, - { - siteName: 'ams-hbase-site', - tagName: 'version1' - }, - { - siteName: 'site-without-properties', - tagName: 'version1' - } - ], configs = [ { name: 'hbase.client.scanner.caching',
