You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ds...@apache.org on 2015/06/15 19:43:53 UTC
ambari git commit: AMBARI-11933 Ambari needs to copy ssl-client.xml
to a dedicated directory under HADOOP_CONF (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk eaf9a2779 -> df082c1b1
AMBARI-11933 Ambari needs to copy ssl-client.xml to a dedicated directory under HADOOP_CONF (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/df082c1b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/df082c1b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/df082c1b
Branch: refs/heads/trunk
Commit: df082c1b17967528b71d617fc35f4251cc33b52f
Parents: eaf9a27
Author: Dmytro Sen <ds...@apache.org>
Authored: Mon Jun 15 20:42:25 2015 +0300
Committer: Dmytro Sen <ds...@apache.org>
Committed: Mon Jun 15 20:42:25 2015 +0300
----------------------------------------------------------------------
.../HDFS/2.1.0.2.0/package/scripts/hdfs.py | 16 +++++++++++++++-
.../HDFS/2.1.0.2.0/package/scripts/params_linux.py | 1 +
.../YARN/2.1.0.2.0/package/scripts/params_linux.py | 2 ++
.../YARN/2.1.0.2.0/package/scripts/yarn.py | 15 +++++++++++++++
4 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/df082c1b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py
index a0e1217..1a34a24 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs.py
+++ b/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,
http://git-wip-us.apache.org/repos/asf/ambari/blob/df082c1b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
index bc5a96b..3d2c2df 100644
--- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
+++ b/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+
http://git-wip-us.apache.org/repos/asf/ambari/blob/df082c1b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index 35cfef4..dc3d77d 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++ b/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
http://git-wip-us.apache.org/repos/asf/ambari/blob/df082c1b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
index 197bb80..f33ad18 100644
--- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/yarn.py
+++ b/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,