From f42342d2c3efd61a08b1dcd5d6373803b7bbd3bc Mon Sep 17 00:00:00 2001 From: Serguei Bezverkhi Date: Wed, 12 Jul 2017 13:42:39 -0400 Subject: Adding targetcli tool to cinder-volume targetcli tool will be used by kolla-k8s's iscsi-target microservice to save and restore lioadm targets. Change-Id: I7c38d814c5d1dd336d7199c41b77d63b06a4989b --- docker/cinder/cinder-volume/Dockerfile.j2 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index bcf6c30fe..9f2376799 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -8,8 +8,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set cinder_volume_packages = [ 'nfs-utils', + 'python-rtslib', 'scsi-target-utils', - 'python-rtslib' + 'targetcli' ] %} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} @@ -20,8 +21,9 @@ 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', - 'python-rtslib' + 'python-rtslib', + 'targetcli', + 'tgt' ] %} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} @@ -35,7 +37,8 @@ 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' + 'python-rtslib', + 'targetcli' ] %} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} {% endif %} -- cgit v1.2.3