Merge "Move to Debian 'buster'"

7 files changed, 6 insertions, 33 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 46c4a8d79..2087af895 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -328,10 +328,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
    'tgt']
 %}
 
-{% if base_distro in ['debian'] %}
-   {% set base_apt_packages = base_apt_packages + [ 'udev/stretch-backports' ] %}
-{% endif %}
-
 {% set base_compiler_packages = [
     'build-essential'
 ] %}
diff --git a/docker/base/sources.list.debian b/docker/base/sources.list.debian
index 7cb05cab8..48e2e7137 100644
--- a/docker/base/sources.list.debian
+++ b/docker/base/sources.list.debian
@@ -1,12 +1,8 @@
 # Default repos
-deb http://deb.debian.org/debian stretch main
+deb http://deb.debian.org/debian buster main
 
 # debian security updates
-deb http://security.debian.org/debian-security stretch/updates main
-
-# Linaro repo for Kolla
-# ceph, libvirt, opendaylight, openvswitch, qemu
-deb http://obs.linaro.org/ERP:/18.06/Debian_9/ ./
+deb http://security.debian.org/debian-security buster/updates main
 
 deb https://packages.grafana.com/oss/deb stable main
 
@@ -14,8 +10,4 @@ deb https://packages.grafana.com/oss/deb stable main
 deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
 
 # main docker repo
-deb https://download.docker.com/linux/debian stretch stable
-
-# Percona XtraBackup repo
-deb http://repo.percona.com/apt stretch main
-
+deb https://download.docker.com/linux/debian buster stable
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 4af30dede..fb249b43a 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -37,7 +37,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'git',
         'jq',
         'libffi-dev',
-        'libmariadbclient-dev',
+        'libmariadb-dev-compat',
         'libssl-dev',
         'libxslt1-dev',
         'mariadb-client',
diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index 8f58e2b74..6ddc2e5b3 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -61,13 +61,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'targetcli-fb'
         ] %}
 
-        # systemd is needed to get python-guestfs installed
-        {% if base_distro == 'debian' %}
-            {% set nova_compute_packages = nova_compute_packages + [
-                'systemd/stretch-backports'
-            ] %}
-        {% endif %}
-
 {{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
 
 RUN rm -f /etc/nova/nova-compute.conf
@@ -120,13 +113,6 @@ RUN rm -f /etc/nova/nova-compute.conf
             ] %}
         {% endif %}
 
-        # systemd is needed to get python-guestfs installed
-        {% if base_distro == 'debian' %}
-            {% set nova_compute_packages = nova_compute_packages + [
-                'systemd/stretch-backports'
-            ] %}
-        {% endif %}
-
 RUN mkdir -p /etc/ceph
 
     {% endif %}
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index a8311e418..48410c801 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -59,7 +59,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
     {% if base_distro in ['debian'] %}
         {% set nova_libvirt_packages = nova_libvirt_packages + [
-            'libpam-systemd/stretch-backports',
             'usermode'
         ] %}
     {% endif %}
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 4e0412598..3b1d65b0b 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -249,7 +249,7 @@ ENV DEBIAN_FRONTEND noninteractive
             'ca-certificates',
             'git',
             'libffi-dev',
-            'libmariadbclient-dev',
+            'libmariadb-dev-compat',
             'libpq-dev',
             'libssl-dev',
             'libxml2-dev',
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index aedaef941..e23dde96a 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
     {% if base_distro == 'debian' %}
          {% set rabbitmq_packages = rabbitmq_packages + [
-             'rabbitmq-server/stretch-backports'
+             'rabbitmq-server',
          ] %}
     {% else %}
          {% set rabbitmq_packages = rabbitmq_packages + [