diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-29 09:42:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-29 09:42:12 +0000 |
| commit | 1439f839d42882c80ce81a1061dc52256df69fba (patch) | |
| tree | f984f78e654e7579b5e981cce60b67cd9e5193df /docker | |
| parent | b710f816666416e05954e78682d35f5cba315285 (diff) | |
| parent | a1b74b76977f8300938c6a6a9adf67af6cd50086 (diff) | |
| download | kolla-1439f839d42882c80ce81a1061dc52256df69fba.tar.gz kolla-1439f839d42882c80ce81a1061dc52256df69fba.zip | |
Merge "Add cinderlib RPM to cinder-volume"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index a65718bbc..55bf62a77 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -16,10 +16,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if distro_python_version.startswith('3') %} {% set cinder_volume_packages = cinder_volume_packages + [ 'python3-rtslib', + 'python3-cinderlib', ] %} {% else %} {% set cinder_volume_packages = cinder_volume_packages + [ 'python-rtslib', + 'python2-cinderlib', ] %} {% endif %} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} |