diff options
| author | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-27 13:30:37 +0200 |
|---|---|---|
| committer | Ismaël Bouya <ismael.bouya@normalesup.org> | 2018-06-27 13:30:37 +0200 |
| commit | f1d583bfdaf881116e5f9ca9e050307e7acdc28e (patch) | |
| tree | 1d70c8ae571e25cafe5ad481f3748be3588e0cd6 /modules/base_installation | |
| parent | bb0de052ea671bb74c077df89fd4268e42f8714d (diff) | |
| download | Puppet-f1d583bfdaf881116e5f9ca9e050307e7acdc28e.tar.gz Puppet-f1d583bfdaf881116e5f9ca9e050307e7acdc28e.tar.zst Puppet-f1d583bfdaf881116e5f9ca9e050307e7acdc28e.zip | |
Allow to pass arguments in puppet_reset_and_apply
Diffstat (limited to 'modules/base_installation')
| -rw-r--r-- | modules/base_installation/files/scripts/puppet_reset_and_apply | 3 |
1 files changed, 2 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 0350e6e..7ec7053 100644 --- a/modules/base_installation/files/scripts/puppet_reset_and_apply +++ b/modules/base_installation/files/scripts/puppet_reset_and_apply | |||
| @@ -6,9 +6,10 @@ git fetch origin | |||
| 6 | branch="master" | 6 | branch="master" |
| 7 | if [ -n "$1" ]; then | 7 | if [ -n "$1" ]; then |
| 8 | branch="$1" | 8 | branch="$1" |
| 9 | shift | ||
| 9 | fi | 10 | fi |
| 10 | 11 | ||
| 11 | git reset --hard origin/$branch | 12 | git reset --hard origin/$branch |
| 12 | 13 | ||
| 13 | git submodule update --init | 14 | git submodule update --init |
| 14 | puppet_apply --test manifests/site.pp | 15 | puppet_apply "$@" --test manifests/site.pp |