Bläddra i källkod

Revert "AMBARI-4626. "Capacity Scheduler" section in Ambari does not allow ACL value of "user group" with spaces (aonishuk)"

This reverts commit f1d1be8ded1f374a54d2801179ae3a534781a0b9.
Jonathan Hurley 10 år sedan
förälder
incheckning
0b00e25b0d

+ 1 - 1
ambari-common/src/main/python/resource_management/core/source.py

@@ -130,7 +130,7 @@ else:
       self.context.update(variables)
       
       rendered = self.template.render(self.context)
-      return rendered
+      return rendered + "\n" if not rendered.endswith('\n') else rendered
     
   class InlineTemplate(Template):
     def __init__(self, name, extra_imports=[], **kwargs):

+ 1 - 1
ambari-common/src/main/python/resource_management/libraries/providers/xml_config.py

@@ -41,7 +41,7 @@ class XmlConfigProvider(Provider):
     {% for key, value in configurations_dict|dictsort %}
     <property>
       <name>{{ key|e }}</name>
-      <value>{{ resource_management.core.source.InlineTemplate(value).get_content() |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() -%}

+ 3 - 1
ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml

@@ -135,7 +135,9 @@
 
   <property>
     <name>hadoop.security.auth_to_local</name>
-    <value>DEFAULT</value>
+    <value>
+        DEFAULT
+    </value>
 <description>The mapping from kerberos principal names to local OS mapreduce.job.user.names.
   So the default rule is just "DEFAULT" which takes all principals in your default domain to their first component.
   "omalley@APACHE.ORG" and "omalley/admin@APACHE.ORG" to "omalley", if your default domain is APACHE.ORG.