diff options
| author | Zuul <zuul@review.opendev.org> | 2021-11-01 10:41:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-11-01 10:41:21 +0000 |
| commit | 896480988843dc22303e42b9170808d20829970b (patch) | |
| tree | 634b5e53967504e6f8fa7dd3fe6bc6eda35296c5 | |
| parent | f12b5a8bf35f1ebe9fae8d7d936b849f0071ebc4 (diff) | |
| parent | 3d55f995a9945bf5e12050f6ba55edcfc17bc158 (diff) | |
| download | kolla-896480988843dc22303e42b9170808d20829970b.tar.gz kolla-896480988843dc22303e42b9170808d20829970b.zip | |
Merge "cinder-volume: Install binary python libs only in binary"
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 74e8c56b2..4bad98290 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -11,15 +11,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set cinder_volume_packages = [ 'nfs-utils', 'nvmetcli', - 'python3-rtslib', - 'python3-cinderlib', 'sysfsutils', 'targetcli' ] %} -{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} - -{% block cinder_volume_redhat_setup %} -{% endblock %} + {% if install_type == 'binary' %} + {% set cinder_volume_packages = cinder_volume_packages + [ + 'python3-rtslib' + ] %} + {% endif %} {% elif base_package_type == 'deb' %} {% set cinder_volume_packages = [ @@ -27,28 +26,31 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'nfs-common', 'nvme-cli', 'sysfsutils', - 'python3-rtslib-fb', 'targetcli-fb', 'thin-provisioning-tools', 'tgt' ] %} + {% if install_type == 'binary' %} + {% set cinder_volume_packages = cinder_volume_packages + [ + 'cinder-volume', + 'python3-rtslib-fb' + ] %} + {% endif %} + +{% endif %} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} -{% block cinder_volume_ubuntu_setup %} -RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf -{% endblock %} +{% if base_package_type == 'rpm' %} -{% endif %} +{% block cinder_volume_redhat_setup %} +{% endblock %} -{% if install_type == 'binary' %} - {% if base_package_type == 'deb' %} - {% set cinder_volume_packages = [ - 'cinder-volume', - ] %} +{% elif base_package_type == 'deb' %} -{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} - {% endif %} +{% block cinder_volume_ubuntu_setup %} +RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf +{% endblock %} {% endif %} |