You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2016/02/09 16:02:19 UTC
[2/2] ambari git commit: AMBARI-14961. Ambari overwrites
auth_to_local rules in core-site.xml (dlysnichenko)
AMBARI-14961. Ambari overwrites auth_to_local rules in core-site.xml (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9e425d77
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9e425d77
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9e425d77
Branch: refs/heads/branch-2.2
Commit: 9e425d7743c64cd67904ccc7ccd207d73874c138
Parents: e74d083
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue Feb 9 17:02:44 2016 +0200
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue Feb 9 17:03:21 2016 +0200
----------------------------------------------------------------------
.../ambari/server/controller/KerberosHelperImpl.java | 8 +++++++-
.../KERBEROS/1.10.3-10/configuration/kerberos-env.xml | 14 ++++++++++++++
ambari-web/app/data/HDP2/site_properties.js | 7 +++++++
3 files changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e425d77/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index e335e21..737b0aa 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -649,7 +649,13 @@ public class KerberosHelperImpl implements KerberosHelper {
Map<String, Map<String, String>> kerberosConfigurations)
throws AmbariException {
- if (kerberosDescriptor != null) {
+ boolean processAuthToLocalRules = true;
+ Map<String, String> kerberosEnvProperties = existingConfigurations.get("kerberos-env");
+ if(kerberosEnvProperties.containsKey("manage_auth_to_local")) {
+ processAuthToLocalRules = Boolean.valueOf(kerberosEnvProperties.get("manage_auth_to_local"));
+ }
+
+ if (kerberosDescriptor != null && processAuthToLocalRules) {
Set<String> authToLocalProperties;
Set<String> authToLocalPropertiesToSet = new HashSet<String>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e425d77/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
index c76e45a..b5cfa25 100644
--- a/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
+++ b/ambari-server/src/main/resources/common-services/KERBEROS/1.10.3-10/configuration/kerberos-env.xml
@@ -50,6 +50,20 @@
</property>
<property>
+ <name>manage_auth_to_local</name>
+ <description>
+ Indicates whether the hadoop auth_to_local rules should be managed by Ambari or managed manually.
+ </description>
+ <value>true</value>
+ <display-name>Manage Hadoop auth_to_local rules</display-name>
+ <value-attributes>
+ <visible>true</visible>
+ <overridable>false</overridable>
+ <type>boolean</type>
+ </value-attributes>
+ </property>
+
+ <property>
<name>install_packages</name>
<display-name>Install OS-specific Kerberos client package(s)</display-name>
<description>
http://git-wip-us.apache.org/repos/asf/ambari/blob/9e425d77/ambari-web/app/data/HDP2/site_properties.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/data/HDP2/site_properties.js b/ambari-web/app/data/HDP2/site_properties.js
index 7dfdbff..e061c96 100644
--- a/ambari-web/app/data/HDP2/site_properties.js
+++ b/ambari-web/app/data/HDP2/site_properties.js
@@ -1515,6 +1515,13 @@ var hdp2properties = [
"index" : 13
},
{
+ "name": "manage_auth_to_local",
+ "serviceName": "KERBEROS",
+ "filename": "kerberos-env.xml",
+ "category": "Advanced kerberos-env",
+ "index" : 14
+ },
+ {
"name": "admin_server_host",
"serviceName": "KERBEROS",
"filename": "kerberos-env.xml",