aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@riseup.net>2011-03-12 18:18:04 -0300
committerdrebs <drebs@riseup.net>2011-03-12 18:18:04 -0300
commite1bf89dbbeab916b579de5a85ab3bfa4c1de5d60 (patch)
treea628dbc32016b38453e98b4138630314c359f43d
parent740f29de8fa0b432d9468e2bf87b83a3c403f37a (diff)
downloadpuppet-bootstrap-e1bf89dbbeab916b579de5a85ab3bfa4c1de5d60.tar.gz
puppet-bootstrap-e1bf89dbbeab916b579de5a85ab3bfa4c1de5d60.tar.bz2
fixing modules dir
-rw-r--r--manifests/puppet_bootstrap.pp8
-rw-r--r--manifests/stage1.pp2
2 files changed, 5 insertions, 5 deletions
diff --git a/manifests/puppet_bootstrap.pp b/manifests/puppet_bootstrap.pp
index 61dcbda..624d34d 100644
--- 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 1bce6f2..6a8e82a 100644
--- 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",
}