diff options
Diffstat (limited to 'modules')
-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 |