Bläddra i källkod

AMBARI-11933 Ambari needs to copy ssl-client.xml to a dedicated directory under HADOOP_CONF (dsen)

Dmytro Sen 10 år sedan
förälder
incheckning
df082c1b17

+ 15 - 1
ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py

@@ -20,7 +20,6 @@ Ambari Agent
 """
 
 from resource_management import *
-import sys
 import os
 from ambari_commons.os_family_impl import OsFamilyFuncImpl, OsFamilyImpl
 from ambari_commons import OSConst
@@ -71,6 +70,21 @@ def hdfs(name=None):
               group=params.user_group
     )
 
+    Directory(params.hadoop_conf_secure_dir,
+              recursive=True,
+              owner='root',
+              group=params.user_group,
+              cd_access='a',
+              )
+
+    XmlConfig("ssl-client.xml",
+              conf_dir=params.hadoop_conf_secure_dir,
+              configurations=params.config['configurations']['ssl-client'],
+              configuration_attributes=params.config['configuration_attributes']['ssl-client'],
+              owner=params.hdfs_user,
+              group=params.user_group
+    )
+
   if "ssl-server" in params.config['configurations']:
     XmlConfig("ssl-server.xml",
               conf_dir=params.hadoop_conf_dir,

+ 1 - 0
ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py

@@ -72,6 +72,7 @@ hadoop_bin_dir = hdp_select.get_hadoop_dir("bin")
 hadoop_home = hdp_select.get_hadoop_dir("home")
 hadoop_secure_dn_user = hdfs_user
 hadoop_conf_dir = conf_select.get_hadoop_conf_dir()
+hadoop_conf_secure_dir = os.path.join(hadoop_conf_dir, "secure")
 hadoop_lib_home = hdp_select.get_hadoop_dir("lib")
 
 # hadoop parameters for 2.2+

+ 2 - 0
ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py

@@ -101,6 +101,8 @@ if Script.is_hdp_stack_greater_or_equal("2.2"):
   # Timeline Service property that was added in 2.2
   ats_leveldb_state_store_dir = config['configurations']['yarn-site']['yarn.timeline-service.leveldb-state-store.path']
 
+hadoop_conf_secure_dir = os.path.join(hadoop_conf_dir, "secure")
+
 limits_conf_dir = "/etc/security/limits.d"
 execute_path = os.environ['PATH'] + os.pathsep + hadoop_bin_dir + os.pathsep + yarn_container_bin
 

+ 15 - 0
ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py

@@ -302,6 +302,21 @@ def yarn(name = None):
               group=params.user_group
     )
 
+    Directory(params.hadoop_conf_secure_dir,
+              recursive=True,
+              owner='root',
+              group=params.user_group,
+              cd_access='a',
+              )
+
+    XmlConfig("ssl-client.xml",
+              conf_dir=params.hadoop_conf_secure_dir,
+              configurations=params.config['configurations']['ssl-client'],
+              configuration_attributes=params.config['configuration_attributes']['ssl-client'],
+              owner=params.hdfs_user,
+              group=params.user_group
+    )
+
   if "ssl-server" in params.config['configurations']:
     XmlConfig("ssl-server.xml",
               conf_dir=params.hadoop_conf_dir,