diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-31 13:34:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-31 13:34:35 +0000 |
| commit | 13bccdc612bb356fc9bcf75d4f2ec00861e76487 (patch) | |
| tree | 772a563822dd36a1f11862a4114b707fae12c449 /docker | |
| parent | a04bd8d29ef8f2edb775844469be8ba600cf02b0 (diff) | |
| parent | 095a57beda8d1a8596d4b1747742474a73300208 (diff) | |
| download | kolla-13bccdc612bb356fc9bcf75d4f2ec00861e76487.tar.gz kolla-13bccdc612bb356fc9bcf75d4f2ec00861e76487.zip | |
Merge "cinder-volume: handle rtslib(-fb) situation in Debian"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 704d40315..fb3763643 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -22,12 +22,23 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf {% elif base_distro in ['debian', 'ubuntu'] %} {% set cinder_volume_packages = [ 'nfs-common', - 'python-rtslib', 'sysfsutils', - 'targetcli', 'thin-provisioning-tools', 'tgt' ] %} + + # Debian/stretch uses rtslib-fb (like CentOS does) + {% if base_distro == 'debian' %} + {% set cinder_volume_packages = cinder_volume_packages + [ + 'python-rtslib-fb', + 'targetcli-fb' + ] %} + {% elif base_distro == 'ubuntu' %} + {% set cinder_volume_packages = cinder_volume_packages + [ + 'python-rtslib', + 'targetcli' + ] %} + {% endif %} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} {% block cinder_volume_ubuntu_setup %} @@ -40,10 +51,21 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf {% if base_distro in ['debian', 'ubuntu'] %} {% set cinder_volume_packages = [ 'cinder-volume', - 'python-rtslib', - 'targetcli', 'thin-provisioning-tools' ] %} + + # Debian/stretch uses rtslib-fb (like CentOS does) + {% if base_distro == 'debian' %} + {% set cinder_volume_packages = cinder_volume_packages + [ + 'python-rtslib-fb', + 'targetcli-fb' + ] %} + {% elif base_distro == 'ubuntu' %} + {% set cinder_volume_packages = cinder_volume_packages + [ + 'python-rtslib', + 'targetcli' + ] %} + {% endif %} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} {% endif %} |