summaryrefslogtreecommitdiffstats
path: root/modules/base
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2020-06-16 03:18:59 -0400
committerJesse Luehrs <doy@tozt.net>2020-06-16 03:18:59 -0400
commit3d636159df015ee77a879a497fee816334c38357 (patch)
tree9d7bcd32a51b4c6f059047f36374863d11e4d59a /modules/base
parent7d35230d764a2a03a094ffd10d90aec1fd647584 (diff)
downloadpuppet-tozt-3d636159df015ee77a879a497fee816334c38357.tar.gz
puppet-tozt-3d636159df015ee77a879a497fee816334c38357.zip
try fixing puppet script again
Diffstat (limited to 'modules/base')
-rw-r--r--modules/base/files/puppet-tozt2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/base/files/puppet-tozt b/modules/base/files/puppet-tozt
index e385a3c..c7d63c5 100644
--- a/modules/base/files/puppet-tozt
+++ b/modules/base/files/puppet-tozt
@@ -3,5 +3,5 @@ set -eu
set -o pipefail
branch=${1:-master}
-(cd /usr/local/share/puppet-tozt && sudo git checkout --track -B "$branch" && sudo git pull && sudo git submodule update --init --recursive && sudo git reset --hard "origin/$branch")
+(cd /usr/local/share/puppet-tozt && sudo git remote update && sudo git checkout -B "$branch" && sudo git submodule update --init --recursive && sudo git reset --hard "origin/$branch")
sudo ruby -W0 /usr/bin/puppet apply --show_diff --modulepath=/usr/local/share/puppet-tozt/modules --hiera_config=/usr/local/share/puppet-tozt/hiera/hiera.yaml /usr/local/share/puppet-tozt/manifests