diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-04 23:42:24 +0100 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-03-04 23:42:24 +0100 |
| commit | d765eedf28199f6723dee5dab7c81a357be86f72 (patch) | |
| tree | c2f718a5c1106155e73dcdbd762f70d9331a003c /modules/base_installation | |
| parent | cb0490e76ce59bca9fbccba3103864a2e3e8516e (diff) | |
| download | Puppet-d765eedf28199f6723dee5dab7c81a357be86f72.tar.gz Puppet-d765eedf28199f6723dee5dab7c81a357be86f72.tar.zst Puppet-d765eedf28199f6723dee5dab7c81a357be86f72.zip | |
Fix puppet script
Diffstat (limited to 'modules/base_installation')
| -rw-r--r-- | modules/base_installation/files/scripts/puppet_reset_and_apply | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/base_installation/files/scripts/puppet_reset_and_apply b/modules/base_installation/files/scripts/puppet_reset_and_apply index ff71aa8..6743044 100644 --- a/modules/base_installation/files/scripts/puppet_reset_and_apply +++ b/modules/base_installation/files/scripts/puppet_reset_and_apply | |||
| @@ -8,7 +8,7 @@ if [ -n "$1" ]; then | |||
| 8 | branch="$1" | 8 | branch="$1" |
| 9 | fi | 9 | fi |
| 10 | 10 | ||
| 11 | git reset --hard origin/$1 | 11 | git reset --hard origin/$branch |
| 12 | 12 | ||
| 13 | git submodule update --init | 13 | git submodule update --init |
| 14 | puppet apply --test manifests/site.pp | 14 | puppet apply --test manifests/site.pp |