diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-16 10:31:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-16 10:31:46 +0000 |
| commit | 36406a59dc49f47cf0fdefa4dc8258392e8835db (patch) | |
| tree | 7f54a205d841abc42f42c9c2e8be91558dd596cb /docker | |
| parent | 22352f2b5b875bb0e42fb23f4e50bf0ff56ba5bd (diff) | |
| parent | fc11d8d39a756cb66ae353c16f7fa6c4eb405e82 (diff) | |
| download | kolla-36406a59dc49f47cf0fdefa4dc8258392e8835db.tar.gz kolla-36406a59dc49f47cf0fdefa4dc8258392e8835db.zip | |
Merge "Add cinderlib RPM to cinder-volume" into stable/train
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 77748fd1a..a5f3af756 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -15,10 +15,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")) }} |