Browse Source

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>
(cherry picked from commit aa59f0db6f)
changes/12/664012/1
Mark Goddard 2 years ago
parent
commit
b71f2be433
  1. 4
      docker/ceilometer/ceilometer-base/Dockerfile.j2
  2. 2
      docker/ceilometer/ceilometer-compute/Dockerfile.j2
  3. 5
      docker/cinder/cinder-base/Dockerfile.j2
  4. 7
      docker/cinder/cinder-volume/Dockerfile.j2
  5. 2
      docker/designate/designate-base/Dockerfile.j2
  6. 2
      docker/designate/designate-sink/Dockerfile.j2
  7. 23
      docker/dind/Dockerfile.j2
  8. 10
      docker/glance/glance-base/Dockerfile.j2
  9. 2
      docker/heat/heat-base/Dockerfile.j2
  10. 2
      docker/ironic/ironic-api/Dockerfile.j2
  11. 6
      docker/ironic/ironic-conductor/Dockerfile.j2
  12. 2
      docker/ironic/ironic-pxe/Dockerfile.j2
  13. 2
      docker/iscsid/Dockerfile.j2
  14. 2
      docker/keystone/keystone/Dockerfile.j2
  15. 2
      docker/manila/manila-api/Dockerfile.j2
  16. 2
      docker/manila/manila-share/Dockerfile.j2
  17. 2
      docker/mistral/mistral-api/Dockerfile.j2
  18. 4
      docker/neutron/neutron-base/Dockerfile.j2
  19. 4
      docker/nova/nova-api/Dockerfile.j2
  20. 11
      docker/nova/nova-compute/Dockerfile.j2
  21. 2
      docker/nova/nova-consoleauth/Dockerfile.j2
  22. 3
      docker/nova/nova-libvirt/Dockerfile.j2
  23. 62
      docker/openstack-base/Dockerfile.j2
  24. 4
      docker/openvswitch/openvswitch-base/Dockerfile.j2
  25. 2
      docker/panko/panko-api/Dockerfile.j2
  26. 2
      docker/panko/panko-base/Dockerfile.j2
  27. 5
      docker/sensu/sensu-client/Dockerfile.j2
  28. 2
      docker/telegraf/Dockerfile.j2
  29. 2
      docker/zaqar/zaqar-base/Dockerfile.j2

4
docker/ceilometer/ceilometer-base/Dockerfile.j2

@ -30,9 +30,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %}
{% set ceilometer_base_packages = [
'ceilometer-common',
'python-gnocchiclient',
'python3-gnocchiclient',
'python3-panko',
'python-pymongo'
'python3-pymongo'
] %}
{% endif %}

2
docker/ceilometer/ceilometer-compute/Dockerfile.j2

@ -13,7 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %}
{% set ceilometer_compute_packages = [
'ceilometer-agent-compute',
'python-libvirt'
'python3-libvirt'
] %}
{% endif %}
{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}

5
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")) }}

7
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")) }}

2
docker/designate/designate-base/Dockerfile.j2

@ -31,7 +31,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %}
{% set designate_base_packages = [
'designate-common',
'python-tooz'
'python3-tooz'
] %}
{{ macros.install_packages(designate_base_packages | customizable("packages")) }}

2
docker/designate/designate-sink/Dockerfile.j2

@ -23,7 +23,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %}
{% set designate_sink_packages = [
'designate-sink',
'python-designateclient'
'python3-designateclient'
] %}
{% endif %}
{{ macros.install_packages(designate_sink_packages | customizable("packages")) }}

23
docker/dind/Dockerfile.j2

@ -15,31 +15,26 @@ RUN /bin/true
{% elif base_package_type == 'deb' %}
{% set dind_packages = [
'btrfs-progs',
'docker.io',
'openssh-server'
] %}
{% if base_distro in ['debian'] %}
{% set dind_packages = dind_packages + [
'docker-ce'
] %}
{% else %}
{% set dind_packages = dind_packages + [
'docker.io'
] %}
{% endif %}
{% if install_type == 'binary' %}
{% set dind_packages = dind_packages + [
'python-setuptools'
'python3-docker'
] %}
{% endif %}
{{ macros.install_packages(dind_packages | customizable("packages")) }}
{% set dind_pip_packages = [
'docker'
] %}
{% if install_type == 'source' %}
{% set dind_pip_packages = [
'docker'
] %}
RUN {{ macros.install_pip(dind_pip_packages | customizable("pip_packages"), constraints = false) }}
{% endif %}
{% endif %}

10
docker/glance/glance-base/Dockerfile.j2

@ -28,10 +28,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %}
{% set glance_base_packages = [
'glance',
'python-os-brick',
'python-oslo.vmware',
'python-rados',
'python-rbd'
'python3-os-brick',
'python3-oslo.vmware',
'python3-rados',
'python3-rbd',
'python3-rados',
'python3-rbd'
] %}
{% endif %}

2
docker/heat/heat-base/Dockerfile.j2

@ -28,7 +28,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% set heat_base_packages = [
'apache2',
'heat-common',
'libapache2-mod-wsgi'
'libapache2-mod-wsgi-py3'
] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf

2
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 %}

6
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',

2
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'

2
docker/iscsid/Dockerfile.j2

@ -24,7 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %}
{% set iscsid_packages = [
'open-iscsi',
'python-rtslib-fb',
'python3-rtslib-fb',
'targetcli-fb'
] %}

2
docker/keystone/keystone/Dockerfile.j2

@ -28,7 +28,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo
{% elif base_package_type == 'deb' %}
{% set keystone_packages = [
'libapache2-mod-auth-gssapi',
'python-requests-kerberos',
'python3-requests-kerberos',
] %}
{% endif %}
{{ macros.install_packages(keystone_packages | customizable("packages")) }}

2
docker/manila/manila-api/Dockerfile.j2

@ -25,7 +25,7 @@ RUN mkdir -p /var/www/cgi-bin/manila \
{% elif base_package_type == 'deb' %}
{% set manila_api_packages = [
'apache2',
'libapache2-mod-wsgi',
'libapache2-mod-wsgi-py3',
'manila-api'
] %}
{{ macros.install_packages(manila_api_packages | customizable("packages")) }}

2
docker/manila/manila-share/Dockerfile.j2

@ -17,6 +17,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set manila_share_packages = [
'manila-share',
'ceph-common',
'python3-rados',
'python3-rbd',
'sqlite3'
] %}

2
docker/mistral/mistral-api/Dockerfile.j2

@ -24,7 +24,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% elif base_package_type == 'deb' %}
{% set mistral_api_packages = [
'apache2',
'libapache2-mod-wsgi',
'libapache2-mod-wsgi-py3',
'mistral-api'
] %}
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}

4
docker/neutron/neutron-base/Dockerfile.j2

@ -55,8 +55,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'neutron-server',
'openvswitch-switch',
'python3-networking-sfc',
'python-openvswitch',
'python-oslo.vmware'
'python3-openvswitch',
'python3-oslo.vmware'
] %}
{% if base_distro == 'ubuntu' %}

4
docker/nova/nova-api/Dockerfile.j2

@ -27,9 +27,9 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% set nova_api_packages = [
'apache2',
'libapache2-mod-wsgi',
'libapache2-mod-wsgi-py3',
'nova-api',
'python-memcache'
'python3-memcache'
] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}

11
docker/nova/nova-compute/Dockerfile.j2

@ -53,10 +53,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch-switch',
'open-iscsi',
'parted',
'python-guestfs',
'python-ironicclient',
'python-oslo.vmware',
'python-rtslib-fb',
'python3-cephfs',
'python3-guestfs',
'python3-ironicclient',
'python3-oslo.vmware',
'python3-rados',
'python3-rbd',
'python3-rtslib-fb',
'sysfsutils',
'targetcli-fb'
] %}

2
docker/nova/nova-consoleauth/Dockerfile.j2

@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set nova_consoleauth_packages = [
'nova-consoleauth',
'python-memcache'
'python3-memcache'
] %}
{% endif %}

3
docker/nova/nova-libvirt/Dockerfile.j2

@ -40,6 +40,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libvirt-daemon-system',
'openvswitch-switch',
'pm-utils',
'python3-cephfs',
'python3-rados',
'python3-rbd',
'qemu-block-extra',
'qemu-kvm',
'qemu-system',

62
docker/openstack-base/Dockerfile.j2

@ -184,37 +184,37 @@ ENV DEBIAN_FRONTEND noninteractive
{% set openstack_base_packages = [
'openssl',
'patch',
'python-aodhclient',
'python-barbicanclient',
'python-congressclient',
'python-designateclient',
'python-elasticsearch',
'python-etcd',
'python-gnocchiclient',
'python-heatclient',
'python-ironicclient',
'python-kazoo',
'python-keystoneclient',
'python-magnumclient',
'python-manilaclient',
'python-memcache',
'python-mistralclient',
'python-muranoclient',
'python-mysqldb',
'python-openstackclient',
'python-oslo.log',
'python-osprofiler',
'python-pip',
'python-psycopg2',
'python-pymemcache',
'python-pymysql',
'python-redis',
'python-saharaclient',
'python-sysv-ipc',
'python-swiftclient',
'python-troveclient',
'python-zake',
'python-zaqarclient'
'python3-aodhclient',
'python3-barbicanclient',
'python3-congressclient',
'python3-designateclient',
'python3-elasticsearch',
'python3-etcd',
'python3-gnocchiclient',
'python3-heatclient',
'python3-ironicclient',
'python3-kazoo',
'python3-keystoneclient',
'python3-magnumclient',
'python3-manilaclient',
'python3-memcache',
'python3-mistralclient',
'python3-muranoclient',
'python3-mysqldb',
'python3-openstackclient',
'python3-oslo.log',
'python3-osprofiler',
'python3-pip',
'python3-psycopg2',
'python3-pymemcache',
'python3-pymysql',
'python3-redis',
'python3-saharaclient',
'python3-sysv-ipc',
'python3-swiftclient',
'python3-troveclient',
'python3-zake',
'python3-zaqarclient'
] %}
{% endif %}

4
docker/openvswitch/openvswitch-base/Dockerfile.j2

@ -27,8 +27,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %}
{% set openvswitch_base_packages = [
'openvswitch-switch',
'python-openvswitch',
'python-netifaces',
'python3-openvswitch',
'python3-netifaces',
'tcpdump'
] %}

2
docker/panko/panko-api/Dockerfile.j2

@ -23,7 +23,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %}
{% set panko_api_packages = [
'panko-api',
'python-pymongo'
'python3-pymongo'
] %}
{% endif %}

2
docker/panko/panko-base/Dockerfile.j2

@ -33,7 +33,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% elif base_package_type == 'deb' %}
{% set panko_base_packages = [
'apache2',
'libapache2-mod-wsgi'
'libapache2-mod-wsgi-py3'
] %}
{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf

5
docker/sensu/sensu-client/Dockerfile.j2

@ -34,7 +34,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'libsasl2-dev',
'mysql-client',
'ntp',
'python-pymongo'
'python3-cephfs',
'python3-pymongo',
'python3-rados',
'python3-rbd'
] %}
{% if base_distro in ['debian'] %}
{% set sensu_client_packages = sensu_client_packages + [

2
docker/telegraf/Dockerfile.j2

@ -29,7 +29,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif base_package_type == 'deb' %}
{% set telegraf_packages = telegraf_packages + [
'collectd-core',
'python-pip'
'python3-pip'
] %}
{% endif %}

2
docker/zaqar/zaqar-base/Dockerfile.j2

@ -39,7 +39,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set zaqar_base_packages = [
'zaqar-common',
'apache2',
'libapache2-mod-wsgi',
'libapache2-mod-wsgi-py3',
'python3-ldappool'
] %}

Loading…
Cancel
Save