diff options
Diffstat (limited to 'manifests/puppet_bootstrap.pp')
| -rw-r--r-- | manifests/puppet_bootstrap.pp | 5 |
1 files changed, 3 insertions, 2 deletions
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, |