openstack/kolla
Code Issues Proposed changes

Merge "Debian/Ubuntu: more python3 packages for binary"

Browse Source
This commit is contained in:
Zuul 2019-06-07 08:29:09 +00:00 committed by Gerrit Code Review
commit 17ce7d4de6
29 changed files with 93 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

5
docker/cinder/cinder-base/Dockerfile.j2
View File

@ -33,7 +33,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'cinder-common', 'cinder-common',
'lvm2', 'lvm2',
'cryptsetup', 'cryptsetup',
'python-oslo.vmware' 'python3-cephfs',
'python3-oslo.vmware',
'python3-rados',
'python3-rbd'
] %} ] %}
{% endif %} {% endif %}
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }} {{ macros.install_packages(cinder_base_packages | customizable("packages")) }}

3
docker/cinder/cinder-volume/Dockerfile.j2
View File

@ -51,9 +51,6 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
{% if base_package_type == 'deb' %} {% if base_package_type == 'deb' %}
{% set cinder_volume_packages = [ {% set cinder_volume_packages = [
'cinder-volume', 'cinder-volume',
'python-rtslib-fb',
'targetcli-fb',
'thin-provisioning-tools'
] %} ] %}
{{ macros.install_packages(cinder_volume_packages | customizable("packages")) }} {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}

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

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

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

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

21
docker/dind/Dockerfile.j2
View File

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

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

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

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

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

2
docker/ironic/ironic-api/Dockerfile.j2
View File

@ -21,7 +21,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set ironic_api_packages = [ {% set ironic_api_packages = [
'apache2', 'apache2',
'ironic-api', 'ironic-api',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi-py3'
] %} ] %}
{% endif %} {% endif %}

6
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -69,11 +69,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'ironic-conductor', 'ironic-conductor',
'parted', 'parted',
'psmisc', 'psmisc',
'python-ironic-inspector-client', 'python3-ironic-inspector-client',
'python3-proliantutils', 'python3-proliantutils',
'python-pysnmp4', 'python3-pysnmp4',
'python3-scciclient', 'python3-scciclient',
'python-systemd', 'python3-systemd',
'qemu-utils', 'qemu-utils',
'shellinabox', 'shellinabox',
'udev', 'udev',

2
docker/ironic/ironic-pxe/Dockerfile.j2
View File

@ -39,7 +39,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% set ironic_pxe_packages = [ {% set ironic_pxe_packages = [
'apache2', 'apache2',
'ipxe', 'ipxe',
'libapache2-mod-wsgi', 'libapache2-mod-wsgi-py3',
'pxelinux', 'pxelinux',
'syslinux-common', 'syslinux-common',
'tftpd-hpa' 'tftpd-hpa'

2
docker/iscsid/Dockerfile.j2
View File

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

2
docker/keystone/keystone/Dockerfile.j2
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

62
docker/openstack-base/Dockerfile.j2
View File

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

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

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

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

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

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

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

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

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

2
docker/telegraf/Dockerfile.j2
View File

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

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

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