External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-19 04:00:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

Make container storage repository configurable (#4284)

Browse Source
This commit is contained in:
Etienne
2019-02-26 04:29:32 +01:00
committed by Kubernetes Prow Robot
parent b07641c3f3
commit 7dfa39483f
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
roles/container-engine/docker-storage/files/install_container_storage_setup.sh
View File

@@ -2,14 +2,15 @@
set -e
version=${1:-master}
profile_name=${2:-kubespray}
repository=${1:-https://github.com/projectatomic/container-storage-setup.git}
version=${2:-master}
profile_name=${3:-kubespray}
dir=`mktemp -d`
export GIT_DIR=$dir/.git
export GIT_WORK_TREE=$dir
git init
git fetch --depth 1 https://github.com/projectatomic/container-storage-setup.git $version
git fetch --depth 1 $repository $version
git merge FETCH_HEAD
make -C $dir install
rm -rf /var/lib/container-storage-setup/$profile_name $dir
@@ -17,6 +18,6 @@ rm -rf /var/lib/container-storage-setup/$profile_name $dir
set +e
/usr/bin/container-storage-setup create $profile_name /etc/sysconfig/docker-storage-setup && /usr/bin/container-storage-setup activate $profile_name
# FIXME: exit status can be 1 for both fatal and non fatal errors in current release,
# could be improved by matching error strings
# FIXME: exit status can be 1 for both fatal and non fatal errors in current release,
# could be improved by matching error strings
exit 0