From 7dfa39483f4eaad6821f366dc68df4f9f57ec174 Mon Sep 17 00:00:00 2001
From: Etienne <etienne.tremel@orange.fr>
Date: Tue, 26 Feb 2019 04:29:32 +0100
Subject: [PATCH] Make container storage repository configurable (#4284)
---
.../container-engine/docker-storage/defaults/main.yml | 1 +
.../files/install_container_storage_setup.sh | 11 ++++++-----
roles/container-engine/docker-storage/tasks/main.yml | 6 +++++-
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/roles/container-engine/docker-storage/defaults/main.yml b/roles/container-engine/docker-storage/defaults/main.yml
index fef9312c4..6a69556cd 100644
--- a/roles/container-engine/docker-storage/defaults/main.yml
+++ b/roles/container-engine/docker-storage/defaults/main.yml
@@ -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_profile_name: kubespray
docker_container_storage_setup_storage_driver: devicemapper
diff --git a/roles/container-engine/docker-storage/files/install_container_storage_setup.sh b/roles/container-engine/docker-storage/files/install_container_storage_setup.sh
index 18f937b10..604c8439e 100644
--- a/roles/container-engine/docker-storage/files/install_container_storage_setup.sh
+++ b/roles/container-engine/docker-storage/files/install_container_storage_setup.sh
@@ -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
diff --git a/roles/container-engine/docker-storage/tasks/main.yml b/roles/container-engine/docker-storage/tasks/main.yml
index 09f2d70bf..12f215e7a 100644
--- a/roles/container-engine/docker-storage/tasks/main.yml
+++ b/roles/container-engine/docker-storage/tasks/main.yml
@@ -39,5 +39,9 @@
- name: docker-storage-setup | install and run container-storage-setup
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
--
GitLab