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/10/03 19:22:38 UTC
ambari git commit: Revert "AMBARI-18187 : AMS should work in SPNEGO
enabled clusters. (avijayan)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 3a9d723e9 -> edf0deb6b
Revert "AMBARI-18187 : AMS should work in SPNEGO enabled clusters. (avijayan)"
This reverts commit 3a9d723e987a19b38a803da164d92bfa2324cbb8.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/edf0deb6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/edf0deb6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/edf0deb6
Branch: refs/heads/branch-2.4
Commit: edf0deb6b84bc04df7e02a03790d37cff6511987
Parents: 3a9d723
Author: Aravindan Vijayan <av...@hortonworks.com>
Authored: Mon Oct 3 12:22:33 2016 -0700
Committer: Aravindan Vijayan <av...@hortonworks.com>
Committed: Mon Oct 3 12:22:33 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/edf0deb6/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 1837848..3c3d804 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,17 +315,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,
@@ -334,7 +326,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,