From 740f29de8fa0b432d9468e2bf87b83a3c403f37a Mon Sep 17 00:00:00 2001
From: drebs <drebs@riseup.net>
Date: Sat, 12 Mar 2011 18:15:40 -0300
Subject: fixing modules script

---
 manifests/admin_node.pp       | 4 ++--
 manifests/puppet_bootstrap.pp | 5 +++--
 manifests/stage1.pp           | 4 +++-
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'manifests')

diff --git a/manifests/admin_node.pp b/manifests/admin_node.pp
index 364a900..cdea2b9 100644
--- a/manifests/admin_node.pp
+++ b/manifests/admin_node.pp
@@ -2,8 +2,8 @@ import "nodo"
 
 class admin_node {
   nodo::vserver::instance { "$host-master":
-   context      => '2',
-     puppetmaster => true,
+    context      => '2',
+    puppetmaster => true,
   }
 
   host { "puppet":
diff --git a/manifests/puppet_bootstrap.pp b/manifests/puppet_bootstrap.pp
index f094dd7..61dcbda 100644
--- a/manifests/puppet_bootstrap.pp
+++ b/manifests/puppet_bootstrap.pp
@@ -1,12 +1,13 @@
 class puppet_bootstrap {
 
+  $templates_dir = "$puppet_bootstrap_tmpdir/templates"
+
   # puppet-bootstrap script
   file { "/usr/local/sbin/puppet-bootstrap":
     owner   => "root",
     group   => "root",
     mode    => 0755,
     ensure  => present,
-    require => Package["puppet"],
     content => template("$templates_dir/bin/puppet-bootstrap"),
   }
 
@@ -21,7 +22,7 @@ class puppet_bootstrap {
     }
 
      # execute the bootstrap script to download puppet modules
-    exec { "/usr/local/sbin/puppet-bootstrap add-submodules":
+    exec { "/usr/local/sbin/puppet-bootstrap add-submodules $modules_dir":
       user    => root,
       require => [ File["/usr/local/sbin/puppet-bootstrap"], File["$modules_dir"] ],
       timeout => 600,
diff --git a/manifests/stage1.pp b/manifests/stage1.pp
index 6c67ded..1bce6f2 100644
--- a/manifests/stage1.pp
+++ b/manifests/stage1.pp
@@ -2,4 +2,6 @@ import "config.pp"
 import "puppet_bootstrap.pp"
 
 include puppet_bootstrap
-puppet_modules("$puppet_bootstrap_tmpdir/modules")
+puppet_bootstrap::puppet_modules{ "modules":
+  modules_dir => "$puppet_bootstrap_tmpdir/modules",
+}
-- 
cgit v1.2.3