Repository: ambari Updated Branches: refs/heads/branch-2.4 d6da51308 -> 3a9d723e9
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/3a9d723e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a9d723e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a9d723e Branch: refs/heads/branch-2.4 Commit: 3a9d723e987a19b38a803da164d92bfa2324cbb8 Parents: d6da513 Author: Aravindan Vijayan <[email protected]> Authored: Mon Oct 3 12:21:34 2016 -0700 Committer: Aravindan Vijayan <[email protected]> Committed: Mon Oct 3 12:21: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/3a9d723e/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..1837848 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,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, @@ -326,7 +334,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,
