diff options
| author | Zuul <zuul@review.opendev.org> | 2019-06-07 08:29:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-06-07 08:29:09 +0000 |
| commit | 17ce7d4de63273a0beca972b5f3cea1a0b62c928 (patch) | |
| tree | 891c4ca26e98910e327ab2183a7ce188d0fcf342 /docker/ironic | |
| parent | 03e9ac2510a3313a1dc95f130e7ffaf15b9bbc5e (diff) | |
| parent | aa59f0db6f88ed0a03169b473fdf6d541d34df9f (diff) | |
| download | kolla-17ce7d4de63273a0beca972b5f3cea1a0b62c928.tar.gz kolla-17ce7d4de63273a0beca972b5f3cea1a0b62c928.zip | |
Merge "Debian/Ubuntu: more python3 packages for binary"
Diffstat (limited to 'docker/ironic')
| -rw-r--r-- | docker/ironic/ironic-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/ironic/ironic-pxe/Dockerfile.j2 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index e9d97fdf0..7ca61ee4a 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -21,7 +21,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set ironic_api_packages = [ 'apache2', 'ironic-api', - 'libapache2-mod-wsgi' + 'libapache2-mod-wsgi-py3' ] %} {% endif %} diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index b75ec8498..ba62c50ec 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -69,11 +69,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'ironic-conductor', 'parted', 'psmisc', - 'python-ironic-inspector-client', + 'python3-ironic-inspector-client', 'python3-proliantutils', - 'python-pysnmp4', + 'python3-pysnmp4', 'python3-scciclient', - 'python-systemd', + 'python3-systemd', 'qemu-utils', 'shellinabox', 'udev', diff --git a/docker/ironic/ironic-pxe/Dockerfile.j2 b/docker/ironic/ironic-pxe/Dockerfile.j2 index 00a7e77ec..5cc675657 100644 --- a/docker/ironic/ironic-pxe/Dockerfile.j2 +++ b/docker/ironic/ironic-pxe/Dockerfile.j2 @@ -39,7 +39,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ {% set ironic_pxe_packages = [ 'apache2', 'ipxe', - 'libapache2-mod-wsgi', + 'libapache2-mod-wsgi-py3', 'pxelinux', 'syslinux-common', 'tftpd-hpa' |