You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by av...@apache.org on 2016/08/23 16:56:16 UTC
ambari git commit: Revert "AMBARI-18187 : AMS should work in SPNEGO
enabled clusters. (avijayan)"
Repository: ambari
Updated Branches:
refs/heads/trunk 527a118d5 -> 2897071c1
Revert "AMBARI-18187 : AMS should work in SPNEGO enabled clusters. (avijayan)"
This reverts commit 527a118d5b5840be2bda74b41fefe7c56092a91c.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2897071c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2897071c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2897071c
Branch: refs/heads/trunk
Commit: 2897071c10ef0476749162927189c42c5fd57f84
Parents: 527a118
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Tue Aug 23 09:56:10 2016 -0700
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Tue Aug 23 09:56:10 2016 -0700
----------------------------------------------------------------------
.../AMBARI_METRICS/0.1.0/package/scripts/ams.py | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/2897071c/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 0f9befa..28aba35 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,17 +320,9 @@ 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=truncated_core_site,
+ configurations=params.config['configurations']['core-site'],
configuration_attributes=params.config['configuration_attributes']['core-site'],
owner=params.ams_user,
group=params.user_group,
@@ -339,7 +331,7 @@ def ams(name=None, action=None):
XmlConfig("core-site.xml",
conf_dir=params.hbase_conf_dir,
- configurations=truncated_core_site,
+ configurations=params.config['configurations']['core-site'],
configuration_attributes=params.config['configuration_attributes']['core-site'],
owner=params.ams_user,
group=params.user_group,