diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-24 14:20:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-24 14:20:53 +0000 |
| commit | f96c9ccac3938b67f12eddae576446979777f1cc (patch) | |
| tree | a30d323120f37fcd844a37a71329c28eca8030d1 /docker/iscsid | |
| parent | 6a9681ba9b6a9581a0ac18a56a176aab13f9f55a (diff) | |
| parent | ebaf1f304240cfcc8201d13183782191cc210f28 (diff) | |
| download | kolla-f96c9ccac3938b67f12eddae576446979777f1cc.tar.gz kolla-f96c9ccac3938b67f12eddae576446979777f1cc.zip | |
Merge "handle rtslib(-fb) package names and dependencies"
Diffstat (limited to 'docker/iscsid')
| -rw-r--r-- | docker/iscsid/Dockerfile.j2 | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2 index b5538ad00..7c5401867 100644 --- a/docker/iscsid/Dockerfile.j2 +++ b/docker/iscsid/Dockerfile.j2 @@ -14,11 +14,22 @@ LABEL maintainer="{{ maintainer }}" {% 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")) }} |