Merge "Adding python-rtslib to cinder-volume for lioadm support"

This commit is contained in:
Jenkins 2017-07-11 04:19:34 +00:00 committed by Gerrit Code Review
commit 6c85c00d51
1 changed files with 6 additions and 3 deletions

View File

@ -8,7 +8,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set cinder_volume_packages = [
'nfs-utils',
'scsi-target-utils'
'scsi-target-utils',
'python-rtslib'
] %}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
@ -19,7 +20,8 @@ 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',
'tgt'
'tgt',
'python-rtslib'
] %}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
@ -32,7 +34,8 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
{% if install_type == 'binary' %}
{% if base_distro in ['debian', 'ubuntu'] %}
{% set cinder_volume_packages = [
'cinder-volume'
'cinder-volume',
'python-rtslib'
] %}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
{% endif %}