Repository: ambari Updated Branches: refs/heads/trunk a400f5a98 -> 4386b4fc0
AMBARI-7798 Moving fs.defaultFS from hadoop-env to core-site for GlusterFS.2.1 Stack (screeley via eboyd) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4386b4fc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4386b4fc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4386b4fc Branch: refs/heads/trunk Commit: 4386b4fc0005197ebbc42b57e809ce52de22ff1c Parents: a400f5a Author: Erin A Boyd <[email protected]> Authored: Wed Oct 1 04:12:38 2014 -0400 Committer: root <[email protected]> Committed: Wed Oct 1 04:14:56 2014 -0400 ---------------------------------------------------------------------- .../services/GLUSTERFS/configuration/core-site.xml | 4 ++++ .../services/GLUSTERFS/configuration/hadoop-env.xml | 15 --------------- .../services/GLUSTERFS/configuration/core-site.xml | 5 ++++- .../services/GLUSTERFS/configuration/hadoop-env.xml | 15 --------------- 4 files changed, 8 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/4386b4fc/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml index 553b48d..00dd4b3 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/core-site.xml @@ -46,4 +46,8 @@ <value>/mnt/gv0</value> </property> + <property> + <name>fs.defaultFS</name> + <value>glusterfs:///localhost:8020</value> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/4386b4fc/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml index 6c6d4c1..2cd5c77 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.0.6.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml @@ -22,21 +22,6 @@ <configuration supports_final="false"> <property> - <name>fs.defaultFS</name> - <!-- cluster variant --> - <value>glusterfs:///localhost:8020</value> - <description>The name of the default file system. Either the - literal string "local" or a host:port for NDFS.</description> - <final>true</final> - </property> - <property> - <name>fs.default.name</name> - <!-- cluster variant --> - <value>glusterfs:///localhost:8020</value> - <description>The name of the default file system. Either the - literal string "local" or a host:port for NDFS.</description> - </property> - <property> <name>hadoop_pid_dir_prefix</name> <value>/var/run/hadoop</value> <description>Hadoop PID Dir Prefix</description> http://git-wip-us.apache.org/repos/asf/ambari/blob/4386b4fc/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml index 70e6479..7794ac8 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/core-site.xml @@ -34,5 +34,8 @@ <value>org.apache.hadoop.fs.glusterfs.GlusterFileSystem</value> </property> - + <property> + <name>fs.defaultFS</name> + <value>glusterfs:///localhost:8020</value> + </property> </configuration> http://git-wip-us.apache.org/repos/asf/ambari/blob/4386b4fc/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml index 6c6d4c1..2cd5c77 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.1.GlusterFS/services/GLUSTERFS/configuration/hadoop-env.xml @@ -22,21 +22,6 @@ <configuration supports_final="false"> <property> - <name>fs.defaultFS</name> - <!-- cluster variant --> - <value>glusterfs:///localhost:8020</value> - <description>The name of the default file system. Either the - literal string "local" or a host:port for NDFS.</description> - <final>true</final> - </property> - <property> - <name>fs.default.name</name> - <!-- cluster variant --> - <value>glusterfs:///localhost:8020</value> - <description>The name of the default file system. Either the - literal string "local" or a host:port for NDFS.</description> - </property> - <property> <name>hadoop_pid_dir_prefix</name> <value>/var/run/hadoop</value> <description>Hadoop PID Dir Prefix</description>
