openstack/kolla
Code Issues Proposed changes

cinder-volume: handle rtslib(-fb) situation in Debian

Browse Source 
Closes-Bug: #1714217

Change-Id: I17b387a64132dc2cf17ead292b2472427f04e263
This commit is contained in:
Marcin Juszkiewicz 2017-08-31 11:19:15 +01:00
parent 7b3e9c595c
commit 095a57beda
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
docker/cinder/cinder-volume/Dockerfile.j2
View File

@ -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 %}