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

29 files changed, 93 insertions, 85 deletions

diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 4b004c945..10c838215 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/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 %}
 
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index d4d238b18..e587ad861 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/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")) }}
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 7d16272f1..a9f1f7ef8 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 fb268e990..c6f07ec29 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -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")) }}
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2
index 86d3c3eb1..12825cd3e 100644
--- a/docker/designate/designate-base/Dockerfile.j2
+++ b/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")) }}
diff --git a/docker/designate/designate-sink/Dockerfile.j2 b/docker/designate/designate-sink/Dockerfile.j2
index ea194c4db..4383dbbd3 100644
--- a/docker/designate/designate-sink/Dockerfile.j2
+++ b/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")) }}
diff --git a/docker/dind/Dockerfile.j2 b/docker/dind/Dockerfile.j2
index 33b8fb851..fa5daad14 100644
--- a/docker/dind/Dockerfile.j2
+++ b/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 %}
 
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2
index 905376338..ca74e5bfd 100644
--- a/docker/glance/glance-base/Dockerfile.j2
+++ b/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 %}
 
diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index fa9033733..167a45c91 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/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
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'
diff --git a/docker/iscsid/Dockerfile.j2 b/docker/iscsid/Dockerfile.j2
index d4b692d1a..22e800ce8 100644
--- a/docker/iscsid/Dockerfile.j2
+++ b/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'
     ] %}
 
diff --git a/docker/keystone/keystone/Dockerfile.j2 b/docker/keystone/keystone/Dockerfile.j2
index 2dbe71ad0..f38722769 100644
--- a/docker/keystone/keystone/Dockerfile.j2
+++ b/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")) }}
diff --git a/docker/manila/manila-api/Dockerfile.j2 b/docker/manila/manila-api/Dockerfile.j2
index 3b108b350..1176e6247 100644
--- a/docker/manila/manila-api/Dockerfile.j2
+++ b/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")) }}
diff --git a/docker/manila/manila-share/Dockerfile.j2 b/docker/manila/manila-share/Dockerfile.j2
index 702b4d91f..2384b0cf2 100644
--- a/docker/manila/manila-share/Dockerfile.j2
+++ b/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'
         ] %}
 
diff --git a/docker/mistral/mistral-api/Dockerfile.j2 b/docker/mistral/mistral-api/Dockerfile.j2
index 26752a774..bcd4530f9 100644
--- a/docker/mistral/mistral-api/Dockerfile.j2
+++ b/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")) }}
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2
index 26b3f5cc4..cec108200 100644
--- a/docker/neutron/neutron-base/Dockerfile.j2
+++ b/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' %}
diff --git a/docker/nova/nova-api/Dockerfile.j2 b/docker/nova/nova-api/Dockerfile.j2
index d000fae70..848782004 100644
--- a/docker/nova/nova-api/Dockerfile.j2
+++ b/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")) }}
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index e4f3aa5c3..ffc321318 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/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'
         ] %}
diff --git a/docker/nova/nova-consoleauth/Dockerfile.j2 b/docker/nova/nova-consoleauth/Dockerfile.j2
index 9e8613f6c..6974bde2a 100644
--- a/docker/nova/nova-consoleauth/Dockerfile.j2
+++ b/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 %}
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 9c54d84d9..fb75e443a 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/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-system',
         'trousers'
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 03c64fc7d..9d90e31c3 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/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 %}
 
diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2
index 439eb12ac..2d48f8468 100644
--- a/docker/openvswitch/openvswitch-base/Dockerfile.j2
+++ b/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'
     ] %}
 
diff --git a/docker/panko/panko-api/Dockerfile.j2 b/docker/panko/panko-api/Dockerfile.j2
index ca0db74ee..394ddc8aa 100644
--- a/docker/panko/panko-api/Dockerfile.j2
+++ b/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 %}
diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2
index fa7780cd3..0be5db429 100644
--- a/docker/panko/panko-base/Dockerfile.j2
+++ b/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
diff --git a/docker/sensu/sensu-client/Dockerfile.j2 b/docker/sensu/sensu-client/Dockerfile.j2
index ffad2c95c..28779ed4f 100644
--- a/docker/sensu/sensu-client/Dockerfile.j2
+++ b/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 + [
diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2
index 4af2a7e33..3709c5f3e 100644
--- a/docker/telegraf/Dockerfile.j2
+++ b/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 %}
 
diff --git a/docker/zaqar/zaqar-base/Dockerfile.j2 b/docker/zaqar/zaqar-base/Dockerfile.j2
index 19dc11e1a..71fa2d90c 100644
--- a/docker/zaqar/zaqar-base/Dockerfile.j2
+++ b/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'
         ] %}