fixing modules dir

diff --git a/manifests/puppet_bootstrap.pp b/manifests/puppet_bootstrap.pp
index 61dcbdaf6c2a626d29489895d3ce207810cba122..624d34d0de9bd72ec90f3f001d15e25ccbfd0ba1 100644 (file)
--- a/manifests/puppet_bootstrap.pp
+++ b/manifests/puppet_bootstrap.pp
@@ -11,10 +11,10 @@ class puppet_bootstrap {
     content => template("$templates_dir/bin/puppet-bootstrap"),
   }
 
-  define puppet_modules($modules_dir) {
+  define puppet_modules($puppet_dir) {
 
     # directory to download modules
-    file { "$modules_dir":
+    file { "$puppet_dir/modules":
       ensure  => directory,
       owner   => "puppet",
       group   => "puppet",
@@ -22,9 +22,9 @@ class puppet_bootstrap {
     }
 
      # execute the bootstrap script to download puppet modules
-    exec { "/usr/local/sbin/puppet-bootstrap add-submodules $modules_dir":
+    exec { "/usr/local/sbin/puppet-bootstrap add-submodules $puppet_dir":
       user    => root,
-      require => [ File["/usr/local/sbin/puppet-bootstrap"], File["$modules_dir"] ],
+      require => [ File["/usr/local/sbin/puppet-bootstrap"], File["$puppet_dir/modules"] ],
       timeout => 600,
     }
 

diff --git a/manifests/stage1.pp b/manifests/stage1.pp
index 1bce6f2b2f5843062c55ae8eb8e375610b10b701..6a8e82a1ed7c2a3a9b60626d9179f714df4c9665 100644 (file)
--- a/manifests/stage1.pp
+++ b/manifests/stage1.pp
@@ -3,5 +3,5 @@ import "puppet_bootstrap.pp"
 
 include puppet_bootstrap
 puppet_bootstrap::puppet_modules{ "modules":
-  modules_dir => "$puppet_bootstrap_tmpdir/modules",
+  puppet_dir => "$puppet_bootstrap_tmpdir",
 }