Repository: ambari Updated Branches: refs/heads/trunk e671d0fe7 -> 527a118d5
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/527a118d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/527a118d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/527a118d Branch: refs/heads/trunk Commit: 527a118d5b5840be2bda74b41fefe7c56092a91c Parents: e671d0f Author: Aravindan Vijayan <[email protected]> Authored: Tue Aug 23 09:54:34 2016 -0700 Committer: Aravindan Vijayan <[email protected]> Committed: Tue Aug 23 09:54:34 2016 -0700 ---------------------------------------------------------------------- .../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/527a118d/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..0f9befa 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,17 @@ 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 params.config['configurations']['core-site']['hadoop.http.authentication.type']: + truncated_core_site.pop('hadoop.http.authentication.type') + if params.config['configurations']['core-site']['hadoop.http.filter.initializers']: + 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 +339,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,
