You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ao...@apache.org on 2015/06/01 14:30:36 UTC
ambari git commit: AMBARI-11557. yarn.admin.acl set to empty string
causes all data to be exposed in Tez view (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk dcc93c9c6 -> ee96fdebc
AMBARI-11557. yarn.admin.acl set to empty string causes all data to be exposed in Tez view (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ee96fdeb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ee96fdeb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ee96fdeb
Branch: refs/heads/trunk
Commit: ee96fdebcbed850814a8d1b2369530478aa5f0f5
Parents: dcc93c9
Author: Andrew Onishuk <ao...@hortonworks.com>
Authored: Mon Jun 1 15:30:28 2015 +0300
Committer: Andrew Onishuk <ao...@hortonworks.com>
Committed: Mon Jun 1 15:30:28 2015 +0300
----------------------------------------------------------------------
.../providers/modify_properties_file.py | 4 +-
.../libraries/providers/properties_file.py | 2 +-
.../libraries/providers/xml_config.py | 2 +-
.../HDFS/2.1.0.2.0/configuration/core-site.xml | 4 +-
.../services/HBASE/configuration/hbase-site.xml | 4 +-
.../services/HDFS/configuration/core-site.xml | 2 +-
.../services/HDFS/configuration/hdfs-site.xml | 2 +-
.../stacks/HDP/2.2/services/YARN/kerberos.json | 1 +
ambari-web/app/data/HDP2.2/site_properties.js | 40 ++++++++++++++++++++
9 files changed, 50 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee96fdeb/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py b/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
index e71abb8..661cb68 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/modify_properties_file.py
@@ -52,14 +52,14 @@ class ModifyPropertiesFileProvider(Provider):
in_var_value = line.split(delimiter)[1].strip()
if in_var_name in properties:
- value = InlineTemplate(unicode(properties[in_var_name])).get_content().strip()
+ value = InlineTemplate(unicode(properties[in_var_name])).get_content()
new_content_lines[line_num] = u"{0}{1}{2}".format(unicode(in_var_name), delimiter, value)
unsaved_values.remove(in_var_name)
else:
Logger.info(format("Creating new properties file as {filename} doesn't exist"))
for property_name in unsaved_values:
- value = InlineTemplate(unicode(properties[property_name])).get_content().strip()
+ value = InlineTemplate(unicode(properties[property_name])).get_content()
line = u"{0}{1}{2}".format(unicode(property_name), delimiter, value)
new_content_lines.append(line)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee96fdeb/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
index 1d21649..53459dd 100644
--- a/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
+++ b/ambari-common/src/main/python/resource_management/libraries/providers/properties_file.py
@@ -42,7 +42,7 @@ class PropertiesFileProvider(Provider):
config_content = InlineTemplate('''# Generated by Apache Ambari. {{time.asctime(time.localtime())}}
{% for key, value in properties_dict|dictsort %}
-{{key}}{{key_value_delimiter}}{{ resource_management.core.source.InlineTemplate(str(value)).get_content().strip() }}{% endfor %}
+{{key}}{{key_value_delimiter}}{{ resource_management.core.source.InlineTemplate(str(value)).get_content() }}{% endfor %}
''', extra_imports=[time, resource_management, resource_management.core, resource_management.core.source], properties_dict=self.resource.properties, key_value_delimiter=self.resource.key_value_delimiter)
Logger.info(format("Generating properties file: {filepath}"))
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee96fdeb/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 6f6c2a1..0fed503 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
@@ -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(str(value)).get_content().strip() |e }}</value>
+ <value>{{ resource_management.core.source.InlineTemplate(str(value)).get_content() |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() -%}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee96fdeb/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
index dd413a2..a8b5f7b 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/core-site.xml
@@ -138,9 +138,7 @@
<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.
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee96fdeb/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
index 63234f4..b7c1536 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HBASE/configuration/hbase-site.xml
@@ -120,7 +120,7 @@
</property>
<property>
<name>hbase.regionserver.rpc.scheduler.factory.class</name>
- <value> </value>
+ <value></value>
<depends-on>
<property>
<type>hbase-env</type>
@@ -130,7 +130,7 @@
</property>
<property>
<name>hbase.rpc.controllerfactory.class</name>
- <value> </value>
+ <value></value>
<depends-on>
<property>
<type>hbase-env</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee96fdeb/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml
index c1db0f9..12d2789 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/core-site.xml
@@ -30,7 +30,7 @@
<property>
<name>hadoop.security.key.provider.path</name>
- <value> </value>
+ <value></value>
<depends-on>
<property>
<type>hadoop-env</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee96fdeb/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
index d7bd90e..35cab99 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml
@@ -42,7 +42,7 @@
<property>
<name>dfs.encryption.key.provider.uri</name>
- <value> </value>
+ <value></value>
<depends-on>
<property>
<type>hadoop-env</type>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee96fdeb/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
index ff8dc2c..e9482ab 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/YARN/kerberos.json
@@ -19,6 +19,7 @@
"yarn.timeline-service.enabled": "true",
"yarn.timeline-service.http-authentication.type": "kerberos",
"yarn.acl.enable": "true",
+ "yarn.admin.acl": " ",
"yarn.timeline-service.http-authentication.signature.secret": "",
"yarn.timeline-service.http-authentication.signature.secret.file": "",
"yarn.timeline-service.http-authentication.signer.secret.provider": "",
http://git-wip-us.apache.org/repos/asf/ambari/blob/ee96fdeb/ambari-web/app/data/HDP2.2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js b/ambari-web/app/data/HDP2.2/site_properties.js
index 09d9283..1110da0 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -109,6 +109,26 @@ hdp22properties.push(
},
{
"id": "site property",
+ "name": "hadoop.security.key.provider.path",
+ "displayName": "hadoop.security.key.provider.path",
+ "defaultValue": "",
+ "isRequired": false,
+ "category": "Advanced core-site",
+ "serviceName": "HDFS",
+ "filename": "core-site.xml"
+ },
+ {
+ "id": "site property",
+ "name": "dfs.encryption.key.provider.uri",
+ "displayName": "dfs.encryption.key.provider.uri",
+ "defaultValue": "",
+ "isRequired": false,
+ "category": "Advanced hdfs-site",
+ "serviceName": "HDFS",
+ "filename": "hdfs-site.xml"
+ },
+ {
+ "id": "site property",
"name": "*.falcon.graph.blueprints.graph",
"displayName": "*.falcon.graph.blueprints.graph",
"category": "FalconStartupSite",
@@ -876,6 +896,26 @@ hdp22properties.push(
"category": "Advanced hbase-site",
"serviceName": "HBASE",
"filename": "hbase-site.xml"
+ },
+ {
+ "id": "site property",
+ "name": "hbase.regionserver.rpc.scheduler.factory.class",
+ "displayName": "hbase.regionserver.rpc.scheduler.factory.class",
+ "defaultValue": "",
+ "isRequired": false,
+ "category": "Advanced hbase-site",
+ "serviceName": "HBASE",
+ "filename": "hbase-site.xml"
+ },
+ {
+ "id": "site property",
+ "name": "hbase.rpc.controllerfactory.class",
+ "displayName": "hbase.rpc.controllerfactory.class",
+ "defaultValue": "",
+ "isRequired": false,
+ "category": "Advanced hbase-site",
+ "serviceName": "HBASE",
+ "filename": "hbase-site.xml"
}
);