Browse Source

Move to Debian 'buster'

Buster is at freeze phase so safe to update and use. Will give us
Python 3 based OpenStack packages (usually release delayed).

Change-Id: I48c2d252a834716f1bcf10b18f2d32fe541e8137
changes/81/612681/9
Marcin Juszkiewicz 2 years ago
parent
commit
4d31ca695b
  1. 4
      docker/base/Dockerfile.j2
  2. 14
      docker/base/sources.list.debian
  3. 2
      docker/kolla-toolbox/Dockerfile.j2
  4. 14
      docker/nova/nova-compute/Dockerfile.j2
  5. 1
      docker/nova/nova-libvirt/Dockerfile.j2
  6. 2
      docker/openstack-base/Dockerfile.j2
  7. 2
      docker/rabbitmq/Dockerfile.j2
  8. 4
      kolla/common/config.py
  9. 5
      releasenotes/notes/debian-buster-7bd8be7ec4ce0d13.yaml

4
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'
] %}

14
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

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

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

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

@ -58,7 +58,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 %}

2
docker/openstack-base/Dockerfile.j2

@ -250,7 +250,7 @@ ENV DEBIAN_FRONTEND noninteractive
'ca-certificates',
'git',
'libffi-dev',
'libmariadbclient-dev',
'libmariadb-dev-compat',
'libpq-dev',
'libssl-dev',
'libxml2-dev',

2
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 + [

4
kolla/common/config.py

@ -25,14 +25,14 @@ DEFAULT_BASE_TAGS = {
'centos': '7',
'rhel': '7',
'oraclelinux': '7-slim',
'debian': 'stretch-backports',
'debian': 'buster',
'ubuntu': '18.04',
}
DISTRO_RELEASE = {
'centos': '7',
'rhel': '7',
'oraclelinux': '7',
'debian': 'stretch-backports',
'debian': 'buster',
'ubuntu': '18.04',
}

5
releasenotes/notes/debian-buster-7bd8be7ec4ce0d13.yaml

@ -0,0 +1,5 @@
---
features:
- Debian 'buster' (next stable release, now in 'freeze' state) is now used
instead of 'stretch'.
- Several images got enabled for Debian.
Loading…
Cancel
Save