svn commit: r1195720 - /incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp

[rvs]

Author: rvs
Date: Mon Oct 31 23:41:12 2011
New Revision: 1195720

URL: http://svn.apache.org/viewvc?rev=1195720&view=rev
Log:
BIGTOP-214. sequencing in puppet module for Hadoop needs to be imporved

Modified:
    incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp

Modified: 
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp?rev=1195720&r1=1195719&r2=1195720&view=diff
==============================================================================
--- 
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp 
(original)
+++ 
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp 
Mon Oct 31 23:41:12 2011
@@ -23,26 +23,31 @@ class hadoop {
     file {
       "/etc/hadoop/conf/core-site.xml":
         content => template('hadoop/core-site.xml'),
+        require => [Package["hadoop"]],
     }
 
     file {
       "/etc/hadoop/conf/mapred-site.xml":
         content => template('hadoop/mapred-site.xml'),
+        require => [Package["hadoop"]],
     }
 
     file {
       "/etc/hadoop/conf/hdfs-site.xml":
         content => template('hadoop/hdfs-site.xml'),
+        require => [Package["hadoop"]],
     }
 
     file {
       "/etc/hadoop/conf/hadoop-env.sh":
         content => template('hadoop/hadoop-env.sh'),
+        require => [Package["hadoop"]],
     }
 
     file {
       "/etc/default/hadoop":
         content => template('hadoop/hadoop'),
+        require => [Package["hadoop"]],
     }
 
     package { "hadoop":
@@ -51,7 +56,7 @@ class hadoop {
 
     package { "hadoop-native":
       ensure => latest,
-      require => [Package["hadoop"], Yumrepo["Bigtop"]],
+      require => [Package["hadoop"]],
     }
   }
 
@@ -73,7 +78,7 @@ class hadoop {
     if ($hadoop_security_authentication == "kerberos") {
       package { "hadoop-sbin":
         ensure => latest,
-        require => [Package["hadoop"], Yumrepo["Bigtop"]],
+        require => [Package["hadoop"]],
       }
     }
 
@@ -82,7 +87,7 @@ class hadoop {
       hasstatus => true,
       subscribe => [Package["hadoop-datanode"], 
File["/etc/hadoop/conf/core-site.xml"], File["/etc/hadoop/conf/hdfs-site.xml"], 
File["/etc/hadoop/conf/hadoop-env.sh"]],
       require => [ Package["hadoop-datanode"] ],
-    } -> file { $dirs:
+    } <- file { $dirs:
       ensure => directory,
       owner => hdfs,
       group => hdfs,
@@ -124,18 +129,19 @@ class hadoop {
       hasstatus => true,
       subscribe => [Package["hadoop-namenode"], 
File["/etc/hadoop/conf/core-site.xml"], File["/etc/hadoop/conf/hadoop-env.sh"]],
       require => [Package["hadoop-namenode"], Exec["namenode format"]],
-    } -> file { $dirs:
-      ensure => directory,
-      owner => hdfs,
-      group => hdfs,
-      mode => 700,
-    }
+    } 
 
     exec { "namenode format":
       user => "hdfs",
-      command => "/bin/bash -c 'yes Y | hadoop namenode -format'",
+      command => "/bin/bash -c 'yes Y | hadoop namenode -format >> 
/tmp/nn.format.log 2>&1'",
       creates => inline_template("<%= hadoop_storage_locations.split(';')[0] 
%>/namenode/image"),
       require => [Package["hadoop-namenode"]],
+    } <- file { $dirs:
+      ensure => directory,
+      owner => hdfs,
+      group => hdfs,
+      mode => 700,
+      require => [Package["hadoop"]], 
     }
   }
 
@@ -161,7 +167,7 @@ class hadoop {
       hasstatus => true,
       subscribe => [Package["hadoop-jobtracker"], 
File["/etc/hadoop/conf/core-site.xml"], 
File["/etc/hadoop/conf/mapred-site.xml"], 
File["/etc/hadoop/conf/hadoop-env.sh"]],
       require => [ Package["hadoop-jobtracker"] ]
-    } -> file { $dirs:
+    } <- file { $dirs:
       ensure => directory,
       owner => mapred,
       group => mapred,
@@ -195,7 +201,7 @@ class hadoop {
       hasstatus => true,
       subscribe => [Package["hadoop-tasktracker"], 
File["/etc/hadoop/conf/core-site.xml"], 
File["/etc/hadoop/conf/mapred-site.xml"], 
File["/etc/hadoop/conf/hadoop-env.sh"]],
       require => [ Package["hadoop-tasktracker"], 
File["/etc/hadoop/conf/taskcontroller.cfg"] ],
-    } -> file { $dirs:
+    } <- file { $dirs:
       ensure => directory,
       owner => mapred,
       group => mapred,