|
@@ -315,9 +315,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,
|
|
@@ -326,7 +335,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,
|