aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/base_installation/files/scripts/puppet_reset_and_apply3
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
6branch="master" 6branch="master"
7if [ -n "$1" ]; then 7if [ -n "$1" ]; then
8 branch="$1" 8 branch="$1"
9 shift
9fi 10fi
10 11
11git reset --hard origin/$branch 12git reset --hard origin/$branch
12 13
13git submodule update --init 14git submodule update --init
14puppet_apply --test manifests/site.pp 15puppet_apply "$@" --test manifests/site.pp