Repository: ambari Updated Branches: refs/heads/trunk 2897071c1 -> cb0d4e186
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/cb0d4e18 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cb0d4e18 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cb0d4e18 Branch: refs/heads/trunk Commit: cb0d4e1868d89f9d567b05ac8e0c6c7e33bc1f4a Parents: 2897071 Author: Aravindan Vijayan <[email protected]> Authored: Tue Aug 23 10:16:52 2016 -0700 Committer: Aravindan Vijayan <[email protected]> Committed: Tue Aug 23 10:16:52 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/cb0d4e18/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 28aba35..6cf743e 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 @@ -320,9 +320,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, @@ -331,7 +340,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,
