diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-11 04:19:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-11 04:19:34 +0000 |
| commit | 6c85c00d517407dbd2b687160c6aebc2e37213ab (patch) | |
| tree | 4df170ef73c82077723d412d44f3348ffc7e89f2 /docker | |
| parent | 6a437907b2f5c626bfed1ad37187f493eb9eb457 (diff) | |
| parent | fc3ccaf8e6650ed4ce24cc0e0a9d34a415752501 (diff) | |
| download | kolla-6c85c00d517407dbd2b687160c6aebc2e37213ab.tar.gz kolla-6c85c00d517407dbd2b687160c6aebc2e37213ab.zip | |
Merge "Adding python-rtslib to cinder-volume for lioadm support"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 90870fcd7..bcf6c30fe 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -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 %} |