SLIDER-617. review conf/ directories in slider-assembly
diff --git a/slider-assembly/src/conf-hdp/slider-client.xml b/slider-assembly/src/conf-hdp/slider-client.xml
index 0ddf355..136abf0 100644
--- a/slider-assembly/src/conf-hdp/slider-client.xml
+++ b/slider-assembly/src/conf-hdp/slider-client.xml
@@ -22,22 +22,31 @@
-->
<configuration>
-<!--
- <property>
- <name>slider.security.protocol.acl</name>
- <value>*</value>
- <description>When security is enabled, set appropriate acl. Default value means allow everyone.</description>
- </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.
-->
-<!--
- 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>slider.client.resource.origin</name>
+ <value>conf-hdp/slider-client.xml</value>
+ <description>This is just for diagnostics</description>
+ </property>
-<!--
+ <property>
+ <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.application.classpath</name>
+ <value>PROVIDE_CLASS_PATH_FROM_YARN</value>
+ </property>
+
<property>
<name>yarn.resourcemanager.address</name>
<value>@RM-ADDR</value>
@@ -52,6 +61,21 @@
<name>fs.defaultFS</name>
<value>@FILESYSTEM</value>
</property>
+
+ <property>
+ <name>hadoop.registry.zk.quorum</name>
+ <value>@ZK-QUORUM</value>
+ </property>
+
+ <property>
+ <name>yarn.resourcemanager.principal</name>
+ <value>yarn/master@MINICLUSTER</value>
+ </property>
+
+ <property>
+ <name>dfs.namenode.kerberos.principal</name>
+ <value>hdfs/master@MINICLUSTER</value>
+ </property>
-->
</configuration>
diff --git a/slider-assembly/src/conf/slider-client.xml b/slider-assembly/src/conf/slider-client.xml
index b6a5b32..3a42bee 100644
--- a/slider-assembly/src/conf/slider-client.xml
+++ b/slider-assembly/src/conf/slider-client.xml
@@ -22,57 +22,65 @@
-->
<configuration>
- <property>
- <name>slider.zookeeper.quorum</name>
- <value>@ZK-QUORUM</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>slider.client.resource.origin</name>
- <value>conf/slider-client.xml</value>
- <description>This is just for diagnostics</description>
- </property>
+ <!--
+ <property>
+ <name>slider.client.resource.origin</name>
+ <value>conf/slider-client.xml</value>
+ <description>This is just for diagnostics</description>
+ </property>
- <property>
- <name>yarn.log-aggregation-enable</name>
- <value>true</value>
- </property>
+ <property>
+ <name>yarn.log-aggregation-enable</name>
+ <value>true</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>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.address</name>
- <value>@RM-ADDR</value>
- </property>
+ <property>
+ <name>yarn.application.classpath</name>
+ <value>PROVIDE_CLASS_PATH_FROM_YARN</value>
+ </property>
- <property>
- <name>yarn.resourcemanager.scheduler.address</name>
- <value>@RM-SCHEDULER-ADDR</value>
- </property>
+ <property>
+ <name>yarn.resourcemanager.address</name>
+ <value>@RM-ADDR</value>
+ </property>
- <property>
- <name>fs.defaultFS</name>
- <value>@FILESYSTEM</value>
- </property>
+ <property>
+ <name>yarn.resourcemanager.scheduler.address</name>
+ <value>@RM-SCHEDULER-ADDR</value>
+ </property>
- <property>
- <name>yarn.resourcemanager.principal</name>
- <value>yarn/master@MINICLUSTER</value>
- </property>
+ <property>
+ <name>fs.defaultFS</name>
+ <value>@FILESYSTEM</value>
+ </property>
- <property>
- <name>slider.security.enabled</name>
- <value>true</value>
- </property>
+ <property>
+ <name>hadoop.registry.zk.quorum</name>
+ <value>@ZK-QUORUM</value>
+ </property>
- <property>
- <name>dfs.namenode.kerberos.principal</name>
- <value>hdfs/master@MINICLUSTER</value>
- </property>
--->
+ <property>
+ <name>yarn.resourcemanager.principal</name>
+ <value>yarn/master@MINICLUSTER</value>
+ </property>
+
+ <property>
+ <name>dfs.namenode.kerberos.principal</name>
+ <value>hdfs/master@MINICLUSTER</value>
+ </property>
+ -->
</configuration>
