openstack
/
kolla
Code Issues Proposed changes

Merge "Add cinderlib RPM to cinder-volume"

This commit is contained in:
Zuul 2020-01-29 09:42:12 +00:00 committed by Gerrit Code Review
parent b710f81666 a1b74b7697
commit 1439f839d4
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/cinder/cinder-volume/Dockerfile.j2
View File

@ -16,10 +16,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if distro_python_version.startswith('3') %} {% if distro_python_version.startswith('3') %}
{% set cinder_volume_packages = cinder_volume_packages + [ {% set cinder_volume_packages = cinder_volume_packages + [
'python3-rtslib', 'python3-rtslib',
'python3-cinderlib',
] %} ] %}
{% else %} {% else %}
{% set cinder_volume_packages = cinder_volume_packages + [ {% set cinder_volume_packages = cinder_volume_packages + [
'python-rtslib', 'python-rtslib',
'python2-cinderlib',
] %} ] %}
{% endif %} {% endif %}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}