diff options
| author | Mark Goddard <mark@stackhpc.com> | 2019-06-05 17:16:49 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2019-06-06 11:06:58 +0000 |
| commit | aa59f0db6f88ed0a03169b473fdf6d541d34df9f (patch) | |
| tree | d5d2bc3512d17f88a052f652a7d0d073f61fe47c /docker/cinder | |
| parent | 4e083196d14877de458ae16129331c37fe1f6f21 (diff) | |
| download | kolla-aa59f0db6f88ed0a03169b473fdf6d541d34df9f.tar.gz kolla-aa59f0db6f88ed0a03169b473fdf6d541d34df9f.zip | |
Debian/Ubuntu: more python3 packages for binary
backport: Stein
During the switch to Stein UCA, we did not switch all packages to python
3 for Debian/Ubuntu binary images. This change switches some more of
those packages.
Change-Id: I0bff21384d88ea678608392de2db1ba418c96665
Co-Authored-By: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Diffstat (limited to 'docker/cinder')
| -rw-r--r-- | docker/cinder/cinder-base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/cinder/cinder-volume/Dockerfile.j2 | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2 index ba9d638f4..0e00c8ec7 100644 --- a/docker/cinder/cinder-base/Dockerfile.j2 +++ b/docker/cinder/cinder-base/Dockerfile.j2 @@ -33,7 +33,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'cinder-common', 'lvm2', 'cryptsetup', - 'python-oslo.vmware' + 'python3-cephfs', + 'python3-oslo.vmware', + 'python3-rados', + 'python3-rbd' ] %} {% endif %} {{ macros.install_packages(cinder_base_packages | customizable("packages")) }} diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2 index 88d7b9be7..c6f07ec29 100644 --- a/docker/cinder/cinder-volume/Dockerfile.j2 +++ b/docker/cinder/cinder-volume/Dockerfile.j2 @@ -33,7 +33,7 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf {% set cinder_volume_packages = [ 'nfs-common', 'sysfsutils', - 'python-rtslib-fb', + 'python3-rtslib-fb', 'targetcli-fb', 'thin-provisioning-tools', 'tgt' @@ -50,10 +50,7 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf {% if install_type == 'binary' %} {% if base_package_type == 'deb' %} {% set cinder_volume_packages = [ - 'cinder-volume', - 'python-rtslib-fb', - 'targetcli-fb', - 'thin-provisioning-tools' + 'cinder-volume', ] %} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} |