You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2015/07/02 15:47:20 UTC

ambari git commit: AMBARI-12247:Ranger Plugin SSL configuration for YARN needs to be fixed to not clash with HDFS (Velmurugan Periasamy via jluniya)

Repository: ambari
Updated Branches:
  refs/heads/trunk a871dd140 -> 4d03e8c5b


AMBARI-12247:Ranger Plugin SSL configuration for YARN needs to be fixed to not clash with HDFS (Velmurugan Periasamy via jluniya)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4d03e8c5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4d03e8c5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4d03e8c5

Branch: refs/heads/trunk
Commit: 4d03e8c5b50176106a7eb6731334ae1c5c55e2ad
Parents: a871dd1
Author: Jayush Luniya <jl...@hortonworks.com>
Authored: Thu Jul 2 06:47:15 2015 -0700
Committer: Jayush Luniya <jl...@hortonworks.com>
Committed: Thu Jul 2 06:47:15 2015 -0700

----------------------------------------------------------------------
 .../functions/setup_ranger_plugin_xml.py        | 23 ++++++++++++++------
 .../configuration/ranger-yarn-policymgr-ssl.xml |  6 ++---
 .../YARN/configuration/ranger-yarn-security.xml |  4 ++--
 3 files changed, 21 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/4d03e8c5/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
----------------------------------------------------------------------
diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
index f4b460c..a46448c 100644
--- a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
+++ b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py
@@ -112,13 +112,22 @@ def setup_ranger_plugin(component_select_name, service_name,
       group = component_group,
       mode=0744)
 
-    XmlConfig("ranger-policymgr-ssl.xml",
-      conf_dir=component_conf_dir,
-      configurations=plugin_policymgr_ssl_properties,
-      configuration_attributes=plugin_policymgr_ssl_attributes,
-      owner = component_user,
-      group = component_group,
-      mode=0744)
+    if str(service_name).lower() == 'yarn' :
+      XmlConfig("ranger-policymgr-ssl-yarn.xml",
+        conf_dir=component_conf_dir,
+        configurations=plugin_policymgr_ssl_properties,
+        configuration_attributes=plugin_policymgr_ssl_attributes,
+        owner = component_user,
+        group = component_group,
+        mode=0744) 
+    else :
+      XmlConfig("ranger-policymgr-ssl.xml",
+        conf_dir=component_conf_dir,
+        configurations=plugin_policymgr_ssl_properties,
+        configuration_attributes=plugin_policymgr_ssl_attributes,
+        owner = component_user,
+        group = component_group,
+        mode=0744) 
 
     #This should be done by rpm
     #setup_ranger_plugin_jar_symblink(hdp_version, service_name, component_list)

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d03e8c5/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
index 8dbe0c2..ffb06d9 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-policymgr-ssl.xml
@@ -22,7 +22,7 @@
   
   <property>
     <name>xasecure.policymgr.clientssl.keystore</name>
-    <value>/usr/hdp/current/hadoop-client/conf/ranger-plugin-keystore.jks</value>
+    <value>/usr/hdp/current/hadoop-client/conf/ranger-yarn-plugin-keystore.jks</value>
     <description>Java Keystore files</description>
   </property>
 
@@ -35,7 +35,7 @@
 
   <property>
     <name>xasecure.policymgr.clientssl.truststore</name>
-    <value>/usr/hdp/current/hadoop-client/conf/ranger-plugin-truststore.jks</value>
+    <value>/usr/hdp/current/hadoop-client/conf/ranger-yarn-plugin-truststore.jks</value>
     <description>java truststore file</description>
   </property>
 
@@ -58,4 +58,4 @@
     <description>java  truststore credential file</description>
   </property>
 
-</configuration>
\ No newline at end of file
+</configuration>

http://git-wip-us.apache.org/repos/asf/ambari/blob/4d03e8c5/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
index 703db95..59d81ae 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/ranger-yarn-security.xml
@@ -40,7 +40,7 @@
 
   <property>
     <name>ranger.plugin.yarn.policy.rest.ssl.config.file</name>
-    <value>/etc/yarn/conf/ranger-policymgr-ssl.xml</value>
+    <value>/etc/hadoop/conf/ranger-policymgr-ssl-yarn.xml</value>
     <description>Path to the file containing SSL details to contact Ranger Admin</description>
   </property>
 
@@ -56,4 +56,4 @@
     <description>Directory where Ranger policies are cached after successful retrieval from the source</description>
   </property>
 
-</configuration>
\ No newline at end of file
+</configuration>