diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-02-17 22:04:56 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-02-18 01:12:24 +0100 |
| commit | 7c43beaa3f3a6eab784f6cbca79955c9f6a7fff9 (patch) | |
| tree | 6130920064ba0f459827c837ae55e6ab06bc6ff4 /modules/base_installation | |
| parent | 57ae81eaeb85a2892f1afe07ea5be1917f64d065 (diff) | |
| download | Puppet-7c43beaa3f3a6eab784f6cbca79955c9f6a7fff9.tar.gz Puppet-7c43beaa3f3a6eab784f6cbca79955c9f6a7fff9.tar.zst Puppet-7c43beaa3f3a6eab784f6cbca79955c9f6a7fff9.zip | |
Change post-merge script
Diffstat (limited to 'modules/base_installation')
| -rw-r--r-- | modules/base_installation/files/cronie/puppet-post-merge | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/base_installation/files/cronie/puppet-post-merge b/modules/base_installation/files/cronie/puppet-post-merge index ac5e3ff..35fa2d7 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/bin/puppet apply --test `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 ] |