diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-17 12:46:37 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-19 16:19:17 +0100 |
| commit | cfa8eb925ff0115d5d4b2298f7d9a054b869fa75 (patch) | |
| tree | 7ec29ae80af561a848a9c9da7f01731345afe587 /modules/base_installation/files/cronie | |
| parent | 82caf31189f11a9bca4836260e8ee8ba954690f2 (diff) | |
| download | Puppet-cfa8eb925ff0115d5d4b2298f7d9a054b869fa75.tar.gz Puppet-cfa8eb925ff0115d5d4b2298f7d9a054b869fa75.tar.zst Puppet-cfa8eb925ff0115d5d4b2298f7d9a054b869fa75.zip | |
Add puppet_apply script with lockfile
Diffstat (limited to 'modules/base_installation/files/cronie')
| -rw-r--r-- | modules/base_installation/files/cronie/puppet-post-merge | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/base_installation/files/cronie/puppet-post-merge b/modules/base_installation/files/cronie/puppet-post-merge index ac5e3ff..f5c21a7 100644 --- a/modules/base_installation/files/cronie/puppet-post-merge +++ b/modules/base_installation/files/cronie/puppet-post-merge | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/bash | 1 | #!/bin/bash |
| 2 | ## Run Puppet locally using puppet apply | 2 | ## Run Puppet locally using puppet_apply |
| 3 | git submodule update --init | 3 | git submodule update --init |
| 4 | /usr/bin/puppet apply `pwd`/manifests/site.pp | 4 | /usr/local/sbin/puppet_apply `pwd`/manifests/site.pp |
| 5 | 5 | ||
| 6 | ## Log status of the Puppet run | 6 | ## Log status of the Puppet run |
| 7 | if [ $? -eq 0 ] | 7 | if [ $? -eq 0 ] |