fixing modules script

diff --git a/manifests/admin_node.pp b/manifests/admin_node.pp
index 364a900bc6ba487f9b059ed9072d53d48bd15b40..cdea2b9b32ca34fa67d1c60dfd08f0edc8357491 100644 (file)
--- 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 f094dd755a6136ea8833df54c4830f0e2630f8e8..61dcbdaf6c2a626d29489895d3ce207810cba122 100644 (file)
--- 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 6c67ded97b825337271ad3b1f7d20c99300af1b8..1bce6f2b2f5843062c55ae8eb8e375610b10b701 100644 (file)
--- 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",
+}

diff --git a/templates/bin/puppet-bootstrap b/templates/bin/puppet-bootstrap
index 6f93ed467cd3d0ce5c56d6b3a3dd99071e250fd4..9c385f3aee37fa9db47f133a8798055e68b8c59a 100644 (file)
--- a/templates/bin/puppet-bootstrap
+++ b/templates/bin/puppet-bootstrap
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 function usage {
-  echo "Usage: $1 add-submodules"
+  echo "Usage: $1 add-submodules <DIR>"
   exit $2
 }
 
@@ -20,11 +20,7 @@ function add_submodules {
   done
 }
 
-if [ $# -eq 1 ]; then
-  puppet_dir=$1
-elif [ $# -lt 1 ]; then
-  puppet_dir=<%= puppet_dir %>
-else
+if [ $# -ne 2 ]; then
   usage $0 1
   exit 1
 fi