Repository: ambari Updated Branches: refs/heads/branch-2.5 13b9f1156 -> a9e9f01f5
AMBARI-18187 : AMS should work in SPNEGO enabled clusters. (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9e9f01f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9e9f01f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9e9f01f Branch: refs/heads/branch-2.5 Commit: a9e9f01f5cdc2846ecb8da9c164b71b3f9ae0bbf Parents: 13b9f11 Author: Aravindan Vijayan <avija...@hortonworks.com> Authored: Mon Oct 3 12:24:48 2016 -0700 Committer: Aravindan Vijayan <avija...@hortonworks.com> Committed: Mon Oct 3 12:24:48 2016 -0700 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a9e9f01f/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py index 3c3d804..feabdb2 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/ams.py @@ -315,9 +315,18 @@ def ams(name=None, action=None): mode=0644 ) + # Remove spnego configs from core-site, since AMS does not support spnego (AMBARI-14384) + truncated_core_site = {} + truncated_core_site.update(params.config['configurations']['core-site']) + if 'core-site' in params.config['configurations']: + if 'hadoop.http.authentication.type' in params.config['configurations']['core-site']: + truncated_core_site.pop('hadoop.http.authentication.type') + if 'hadoop.http.filter.initializers' in params.config['configurations']['core-site']: + truncated_core_site.pop('hadoop.http.filter.initializers') + XmlConfig("core-site.xml", conf_dir=params.ams_collector_conf_dir, - configurations=params.config['configurations']['core-site'], + configurations=truncated_core_site, configuration_attributes=params.config['configuration_attributes']['core-site'], owner=params.ams_user, group=params.user_group, @@ -326,7 +335,7 @@ def ams(name=None, action=None): XmlConfig("core-site.xml", conf_dir=params.hbase_conf_dir, - configurations=params.config['configurations']['core-site'], + configurations=truncated_core_site, configuration_attributes=params.config['configuration_attributes']['core-site'], owner=params.ams_user, group=params.user_group,
