C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests 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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/container-engine/docker-storage/defaults/main.yml
View file

@ -1,4 +1,5 @@
--- ---
docker_container_storage_setup_repository: https://github.com/projectatomic/container-storage-setup.git
docker_container_storage_setup_version: v0.6.0 docker_container_storage_setup_version: v0.6.0
docker_container_storage_setup_profile_name: kubespray docker_container_storage_setup_profile_name: kubespray
docker_container_storage_setup_storage_driver: devicemapper docker_container_storage_setup_storage_driver: devicemapper

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

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

6
roles/container-engine/docker-storage/tasks/main.yml
View file

@ -39,5 +39,9 @@
- name: docker-storage-setup | install and run container-storage-setup - name: docker-storage-setup | install and run container-storage-setup
become: yes become: yes
script: install_container_storage_setup.sh {{ docker_container_storage_setup_version }} {{ docker_container_storage_setup_profile_name }} script: |
install_container_storage_setup.sh \
{{ docker_container_storage_setup_repository }} \
{{ docker_container_storage_setup_version }} \
{{ docker_container_storage_setup_profile_name }}
notify: Docker | reload systemd notify: Docker | reload systemd