diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-04 21:20:20 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-04 21:20:20 +0100 |
| commit | 89c7d1dea4af6026af00624af77bb1a08c8ebd53 (patch) | |
| tree | 6c3b46adcdadcd75aada126cacf0a36202f31e3e /modules/base_installation/files/cronie/puppet-post-merge | |
| parent | a77b768abb31be9e19563e130d763f163496477d (diff) | |
| parent | c17e63ed33a5260ea5bf0f869d7dce39676526cb (diff) | |
| download | Puppet-89c7d1dea4af6026af00624af77bb1a08c8ebd53.tar.gz Puppet-89c7d1dea4af6026af00624af77bb1a08c8ebd53.tar.zst Puppet-89c7d1dea4af6026af00624af77bb1a08c8ebd53.zip | |
Merge branch 'new_node'
Diffstat (limited to 'modules/base_installation/files/cronie/puppet-post-merge')
| -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 35fa2d7..ac5e3ff 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 --test `pwd`/manifests/site.pp | 4 | /usr/bin/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 ] |