Repository: ambari Updated Branches: refs/heads/trunk 4830715be -> a6a34763d
AMBARI-8763. NodeManager can not be started on CentOS6 and SUSE11 (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a6a34763 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a6a34763 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a6a34763 Branch: refs/heads/trunk Commit: a6a34763d30541c6d2648f2e7a637bfec342514f Parents: 4830715 Author: Andrew Onishuk <aonis...@hortonworks.com> Authored: Wed Dec 17 19:38:11 2014 +0200 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Wed Dec 17 19:38:11 2014 +0200 ---------------------------------------------------------------------- .../resource_management/libraries/providers/xml_config.py | 5 +++-- .../stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a6a34763/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py ---------------------------------------------------------------------- diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py index b5c2b54..5f30190 100644 --- a/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py +++ b/ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py @@ -22,6 +22,7 @@ Ambari Agent import time import os +import resource_management from resource_management import * class XmlConfigProvider(Provider): @@ -35,7 +36,7 @@ class XmlConfigProvider(Provider): {% for key, value in configurations_dict|dictsort %} <property> <name>{{ key|e }}</name> - <value>{{ value|e }}</value> + <value>{{ resource_management.core.source.InlineTemplate(value).get_content().strip() |e }}</value> {%- if not configuration_attrs is none -%} {%- for attrib_name, attrib_occurances in configuration_attrs.items() -%} {%- for property_name, attrib_value in attrib_occurances.items() -%} @@ -47,7 +48,7 @@ class XmlConfigProvider(Provider): {%- endif %} </property> {% endfor %} - </configuration>''', extra_imports=[time], configurations_dict=self.resource.configurations, + </configuration>''', extra_imports=[time, resource_management, resource_management.core, resource_management.core.source], configurations_dict=self.resource.configurations, configuration_attrs=self.resource.configuration_attributes) xml_config_dest_file_path = os.path.join(xml_config_provider_config_dir, filename) http://git-wip-us.apache.org/repos/asf/ambari/blob/a6a34763/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml index c47abef..847711a 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/configuration/yarn-site.xml @@ -47,7 +47,7 @@ </property> <property> <name>yarn.nodemanager.recovery.dir</name> - <value>/var/log/hadoop-yarn/nodemanager/recovery-state</value> + <value>{{yarn_log_dir_prefix}}/nodemanager/recovery-state</value> <description> The local filesystem directory in which the node manager will store state when recovery is enabled.
