diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-03-28 09:42:58 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2017-04-12 11:01:02 +0200 |
| commit | ebaf1f304240cfcc8201d13183782191cc210f28 (patch) | |
| tree | 3a5f25b50b7527806a2ab8dd7dcea243bf9a2078 /docker/iscsid | |
| parent | a130ecb153f555ffd96bebf554eaa10c34a1486d (diff) | |
| download | kolla-ebaf1f304240cfcc8201d13183782191cc210f28.tar.gz kolla-ebaf1f304240cfcc8201d13183782191cc210f28.zip | |
handle rtslib(-fb) package names and dependencies
Ubuntu has rtslib/targetcli packages while CentOS and Debian use 'fb'
fork of those.
Partially-Implements: blueprint multiarch-and-arm64-containers
Change-Id: I8721854eefa6c55bb6e627db9a051c8f9202d1e1
Diffstat (limited to 'docker/iscsid')
| -rw-r--r-- | docker/iscsid/Dockerfile.j2 | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index 2c9a737e1..5eef2b5ab 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/docker/iscsid/Dockerfile.j2 @@ -12,13 +12,24 @@ MAINTAINER {{ maintainer }} 'targetcli' ] %} -{% elif base_distro in ['ubuntu', 'debian'] %} +{% elif base_distro in ['debian', 'ubuntu'] %} {% set iscsid_packages = [ - 'open-iscsi', - 'python-rtslib', - 'targetcli' + 'open-iscsi' ] %} + # Debian/stretch uses rtslib-fb (like CentOS does) + {% if base_distro == 'debian' %} + {% set iscsid_packages = iscsid_packages + [ + 'python-rtslib-fb', + 'targetcli-fb' + ] %} + {% elif base_distro == 'ubuntu' %} + {% set iscsid_packages = iscsid_packages + [ + 'python-rtslib', + 'targetcli' + ] %} + {% endif %} + {% endif %} {{ macros.install_packages(iscsid_packages | customizable("packages")) }} |