diff options
Diffstat (limited to 'docker/cinder')
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index fb3763643..6632bdbe4 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -23,22 +23,12 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf {% set cinder_volume_packages = [ 'nfs-common', 'sysfsutils', + 'python-rtslib-fb', + 'targetcli-fb', '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 %} @@ -51,21 +41,11 @@ 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-fb', + 'targetcli-fb', '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 %} |