Skip to content

Commit 9ff6b45

Browse files
committed
Fix git dependencies with salt 3005.5+
1 parent 03a438a commit 9ff6b45

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/kitchen/provisioner/formula-fetch.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ function linkFormulas() {
7474
do
7575
name=$(basename "$formula")
7676
if [[ ! -L "$SALT_ROOT/$name" ]]; then
77-
ln -fs "$formula/$name" "$SALT_ROOT/$name"
77+
# Using plain copy instead of symlink because salt 3005.5+ refuse to serve files outside of files_root
78+
cp -r "$formula/$name" "$SALT_ROOT/$name"
7879
fi
7980
find "$formula" -maxdepth 1 -mindepth 1 -type d |grep -E "_(modules|states|grains|renderers|returners)" | xargs -I{} \
8081
basename {}| xargs -I{} cp -rs "$formula"/{} "$SALT_ROOT"/
@@ -83,7 +84,7 @@ function linkFormulas() {
8384

8485
# form pkgs
8586
find "$SALT_ENV" -maxdepth 1 -mindepth 1 -path "*_formulas*" -prune -o -name "*" -type d -print0| xargs -I{} -0 -n1 --no-run-if-empty basename {} | xargs -I{} --no-run-if-empty \
86-
ln -fs "$SALT_ENV"/{} "$SALT_ROOT"/{};
87+
cp -r "$SALT_ENV"/{} "$SALT_ROOT"/{};
8788
fi
8889

8990
}

0 commit comments

Comments
 (0)