Changeset 30913 for other-projects/hathitrust/vagrant-spark-hdfs-cluster/trunk/modules

Timestamp:

2016-10-25T10:02:58+13:00 (8 years ago)

Author:

davidb

Message:

Renaming to better represent what the cluster is designed for

Location:

other-projects/hathitrust/vagrant-spark-hdfs-cluster

Files:

• . (moved) (moved from other-projects/hathitrust/vagrant-hadoop-cluster )
• trunk/modules/hadoop/manifests/init.pp (modified) (1 diff)

other-projects/hathitrust/vagrant-spark-hdfs-cluster/trunk/modules/hadoop/manifests/init.pp

@@ -2 +2 @@
 
 exec { "download_hadoop":
-# Download from nearby mirror, otherwise task can time-out
-command => "wget -O /tmp/hadoop.tar.gz http://apache.mirror.amaze.com.au/hadoop/common/hadoop-2.7.3/hadoop-2.7.3.tar.gz",
-# command => "wget -O /tmp/hadoop.tar.gz http://www-eu.apache.org/dist/hadoop/common/hadoop-2.7.3/hadoop-2.7.3.tar.gz",
-path => $path,
-user => $user,
-group => $user,
-unless => "ls ${install_dir} | grep hadoop-2.7.3",
-require => Package["openjdk-7-jdk"]
-}
+  # Download from nearby mirror, otherwise task can time-out
+  command => "wget -O /tmp/hadoop-2.7.3.tar.gz http://apache.mirror.amaze.com.au/hadoop/common/hadoop-2.7.3/hadoop-2.7.3.tar.gz",
+  # command => "wget -O /tmp/hadoop-2.7.3.tar.gz http://www-eu.apache.org/dist/hadoop/common/hadoop-2.7.3/hadoop-2.7.3.tar.gz",
+  path => $path,
+  user => $user,
+  group => $user,
+  unless => "ls ${install_dir} | grep hadoop-2.7.3",
+  require => Package["openjdk-7-jdk"]
+ }
 
 exec { "unpack_hadoop" :
-  command => "tar -zxf /tmp/hadoop.tar.gz -C ${install_dir}",
+  command => "tar -zxf /tmp/hadoop-2.7.3.tar.gz -C ${install_dir}",
   path => $path,
   creates => "${hadoop_home}-2.7.3",
   require => Exec["download_hadoop"]
-}
+ }
 
-exec { 'chown':
-  command => "/bin/chown -R ${user}:${group} /opt/hadoop-2.7.3",
+exec { "rename_hadoop" :
+  command => "ln -s ${install_dir}/hadoop-2.7.3 ${install_dir}/hadoop",
+  path => $path,
+  creates => "${hadoop_home}",
+  require => Exec["unpack_hadoop"]
+ }
+
+exec { 'chown_hadoop':
+  command => "/bin/chown -R ${user}:${group} ${hadoop_home}-2.7.3",
   path => '/bin',
   user => 'root',
-  require => Exec["unpack_hadoop"]
-}
+  require => Exec["rename_hadoop"]
+ }
 
-file {
-  "${hadoop_home}-2.7.3/etc/hadoop/slaves":
+file { 
+  "${hadoop_home}/etc/hadoop/slaves":
   content => template('hadoop/slaves'),
   mode => 644,
   owner => $user,
   group => $group,
-  require => Exec["unpack_hadoop"]
+  require => Exec["chown_hadoop"]
  }
  
-file {
-  "${hadoop_home}-2.7.3/etc/hadoop/masters":
+file { 
+  "${hadoop_home}/etc/hadoop/masters":
   content => template('hadoop/masters'),
   mode => 644,
   owner => $user,
   group => $group,
-  require => Exec["unpack_hadoop"]
+  require => Exec["chown_hadoop"]
  }
 
 file {
-  "${hadoop_home}-2.7.3/etc/hadoop/core-site.xml":
+  "${hadoop_home}/etc/hadoop/core-site.xml":
   content => template('hadoop/core-site.xml'),
   mode => 644,
   owner => $user,
   group => $group,
-  require => Exec["unpack_hadoop"]
+  require => Exec["chown_hadoop"]
  }
  
 file {
-  "${hadoop_home}-2.7.3/etc/hadoop/mapred-site.xml":
+  "${hadoop_home}/etc/hadoop/mapred-site.xml":
   content => template('hadoop/mapred-site.xml'),
   mode => 644,
   owner => $user,
   group => $group,
-  require => Exec["unpack_hadoop"]
+  require => Exec["chown_hadoop"]
  }
  
  file {
-  "${hadoop_home}-2.7.3/etc/hadoop/hdfs-site.xml":
+  "${hadoop_home}/etc/hadoop/hdfs-site.xml":
   content => template('hadoop/hdfs-site.xml'),
   mode => 644,
   owner => $user,
   group => $group,
-  require => Exec["unpack_hadoop"]
+  require => Exec["chown_hadoop"]
  }
  
 file {
-  "${hadoop_home}-2.7.3/etc/hadoop/hadoop-env.sh":
+  "${hadoop_home}/etc/hadoop/hadoop-env.sh":
   content => template('hadoop/hadoop-env.sh'),
   mode => 644,
   owner => $user,
   group => $group,
-  require => Exec["unpack_hadoop"]
+  require => Exec["chown_hadoop"]
  }
 
-file{
-   [ "${hadoop_home}-2.7.3/hadoop_store",
-     "${hadoop_home}-2.7.3/hadoop_store/hdfs",
-     "${hadoop_home}-2.7.3/hadoop_store/hdfs/namenode",
-     "${hadoop_home}-2.7.3/hadoop_store/hdfs/datanode"]:
+file {
+   [ "${hadoop_home}/hadoop_store",
+     "${hadoop_home}/hadoop_store/hdfs",
+     "${hadoop_home}/hadoop_store/hdfs/namenode",
+     "${hadoop_home}/hadoop_store/hdfs/datanode"]:
    ensure => 'directory',
    owner => "${user}",
    group => "${group}",
    mode => 755,
-   require => Exec["unpack_hadoop"]
+   require => Exec["chown_hadoop"]
   }
 
-file_line { "add_hadoop_home":
+file {
+  "/home/${user}/.bashrc-setup-hadoop":
+  content => template('hadoop/setup-hadoop.bash'),
+  mode => 644,
+  owner => $user,
+  group => $group,
+  require => [  Exec["unpack_hadoop"], File["/home/${user}"] ]
+ }
+
+file_line { "setup_hadoop_home":
     ensure => present,
     path => "/home/${user}/.bashrc",
-    line => "export HADOOP_HOME=\"${hadoop_home}-2.7.3\"",
+    line => ". .bashrc-setup-hadoop",
     require => [  Exec["unpack_hadoop"], File["/home/${user}"] ]    
-}
+ }
 
-file_line { "add_hadoop_confdir":
-    ensure => present,
-    path => "/home/${user}/.bashrc",
-    line => 'export HADOOP_CONF_DIR="$HADOOP_HOME/etc/hadoop"',
-    require => [  Exec["unpack_hadoop"], File["/home/${user}"] ]    
-}
 
-file_line { "add_hadoop_setup":
-    ensure => present,
-    path => "/home/${user}/.bashrc",
-    line => 'source "$HADOOP_HOME/etc/hadoop/hadoop-env.sh"',
-    require => [  Exec["unpack_hadoop"], File["/home/${user}"] ]
-}
-
-file_line { "add_hadoop_path":
-    ensure => present,
-    path => "/home/${user}/.bashrc",
-    line => 'export PATH="$PATH:$HADOOP_HOME/bin:$HADOOP_HOME/sbin"',
-    require => [  Exec["unpack_hadoop"], File["/home/${user}"] ]    
-}
 
 }