You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by sm...@apache.org on 2014/10/28 01:22:09 UTC
git commit: SLIDER-556. Some slider-client.xml cleanup/enhancement
related to security
Repository: incubator-slider
Updated Branches:
refs/heads/develop 01f1e7d10 -> 8daa3a06e
SLIDER-556. Some slider-client.xml cleanup/enhancement related to security
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/8daa3a06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/8daa3a06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/8daa3a06
Branch: refs/heads/develop
Commit: 8daa3a06eff9ea9bf5a6c70f65b85cbc84bb67a1
Parents: 01f1e7d
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Mon Oct 27 17:21:35 2014 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Mon Oct 27 17:21:35 2014 -0700
----------------------------------------------------------------------
slider-assembly/src/conf-hdp/slider-client.xml | 63 ++++++++-------------
slider-assembly/src/main/scripts/slider.py | 2 +-
2 files changed, 26 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8daa3a06/slider-assembly/src/conf-hdp/slider-client.xml
----------------------------------------------------------------------
diff --git a/slider-assembly/src/conf-hdp/slider-client.xml b/slider-assembly/src/conf-hdp/slider-client.xml
index a2cc385..0ddf355 100644
--- a/slider-assembly/src/conf-hdp/slider-client.xml
+++ b/slider-assembly/src/conf-hdp/slider-client.xml
@@ -22,49 +22,36 @@
-->
<configuration>
- <property>
- <name>slider.zookeeper.quorum</name>
- <value>localhost:2181</value>
- </property>
-
<!--
<property>
- <name>yarn.application.classpath</name>
- <value>
- /etc/hadoop/conf,/usr/lib/hadoop/*,/usr/lib/hadoop/lib/*,/usr/lib/hadoop-hdfs/*,/usr/lib/hadoop-hdfs/lib/*,/usr/lib/hadoop-yarn/*,/usr/lib/hadoop-yarn/lib/*,/usr/lib/hadoop-mapreduce/*,/usr/lib/hadoop-mapreduce/lib/*
- </value>
- </property>
-
- <property>
- <name>yarn.resourcemanager.address</name>
- <value>@RM-ADDR</value>
- </property>
-
- <property>
- <name>yarn.resourcemanager.scheduler.address</name>
- <value>@RM-SCHEDULER-ADDR</value>
- </property>
-
- <property>
- <name>fs.defaultFS</name>
- <value>@FILESYSTEM</value>
+ <name>slider.security.protocol.acl</name>
+ <value>*</value>
+ <description>When security is enabled, set appropriate acl. Default value means allow everyone.</description>
</property>
+ -->
- <property>
- <name>yarn.resourcemanager.principal</name>
- <value>yarn/master@MINICLUSTER</value>
- </property>
-
- <property>
- <name>slider.security.enabled</name>
- <value>true</value>
- </property>
-
- <property>
- <name>dfs.namenode.kerberos.principal</name>
- <value>hdfs/master@MINICLUSTER</value>
- </property>
+<!--
+ The recommended approach is to configure slider-env.sh and set HADOOP_CONF_DIR.
+ Otherwise, appropriate configurations from hdfs-site, yarn-site, can be dropped in this file
+ for Slider client to work. The following list is not an exhaustive list but the minimal config
+ needed to interact with a non-secure cluster.
-->
+<!--
+ <property>
+ <name>yarn.resourcemanager.address</name>
+ <value>@RM-ADDR</value>
+ </property>
+
+ <property>
+ <name>yarn.resourcemanager.scheduler.address</name>
+ <value>@RM-SCHEDULER-ADDR</value>
+ </property>
+
+ <property>
+ <name>fs.defaultFS</name>
+ <value>@FILESYSTEM</value>
+ </property>
+ -->
</configuration>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/8daa3a06/slider-assembly/src/main/scripts/slider.py
----------------------------------------------------------------------
diff --git a/slider-assembly/src/main/scripts/slider.py b/slider-assembly/src/main/scripts/slider.py
index 969f972..f3c3902 100644
--- a/slider-assembly/src/main/scripts/slider.py
+++ b/slider-assembly/src/main/scripts/slider.py
@@ -26,7 +26,7 @@ CONF = "conf"
IS_WINDOWS = platform.system() == "Windows"
LIB = "lib"
-ENV_KEYS = ["JAVA_HOME", "HADOOP_CONF_DIR"]
+ENV_KEYS = ["JAVA_HOME", "HADOOP_CONF_DIR", "SLIDER_CONF_DIR", "SLIDER_JVM_OPTS", "SLIDER_CLASSPATH_EXTRA"]
SLIDER_CONF_DIR = "SLIDER_CONF_DIR"
SLIDER_JVM_OPTS = "SLIDER_JVM_OPTS"
SLIDER_CLASSPATH_EXTRA = "SLIDER_CLASSPATH_EXTRA"