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
This commit is contained in:
parent
c8bbd0b102
commit
4d31ca695b
@ -328,10 +328,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
|
|||||||
'tgt']
|
'tgt']
|
||||||
%}
|
%}
|
||||||
|
|
||||||
{% if base_distro in ['debian'] %}
|
|
||||||
{% set base_apt_packages = base_apt_packages + [ 'udev/stretch-backports' ] %}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% set base_compiler_packages = [
|
{% set base_compiler_packages = [
|
||||||
'build-essential'
|
'build-essential'
|
||||||
] %}
|
] %}
|
||||||
|
@ -1,12 +1,8 @@
|
|||||||
# Default repos
|
# Default repos
|
||||||
deb http://deb.debian.org/debian stretch main
|
deb http://deb.debian.org/debian buster main
|
||||||
|
|
||||||
# debian security updates
|
# debian security updates
|
||||||
deb http://security.debian.org/debian-security stretch/updates main
|
deb http://security.debian.org/debian-security buster/updates main
|
||||||
|
|
||||||
# Linaro repo for Kolla
|
|
||||||
# ceph, libvirt, opendaylight, openvswitch, qemu
|
|
||||||
deb http://obs.linaro.org/ERP:/18.06/Debian_9/ ./
|
|
||||||
|
|
||||||
deb https://packages.grafana.com/oss/deb stable 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
|
deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
|
||||||
|
|
||||||
# main docker repo
|
# main docker repo
|
||||||
deb https://download.docker.com/linux/debian stretch stable
|
deb https://download.docker.com/linux/debian buster stable
|
||||||
|
|
||||||
# Percona XtraBackup repo
|
|
||||||
deb http://repo.percona.com/apt stretch main
|
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
'git',
|
'git',
|
||||||
'jq',
|
'jq',
|
||||||
'libffi-dev',
|
'libffi-dev',
|
||||||
'libmariadbclient-dev',
|
'libmariadb-dev-compat',
|
||||||
'libssl-dev',
|
'libssl-dev',
|
||||||
'libxslt1-dev',
|
'libxslt1-dev',
|
||||||
'mariadb-client',
|
'mariadb-client',
|
||||||
|
@ -61,13 +61,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
'targetcli-fb'
|
'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")) }}
|
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
|
||||||
|
|
||||||
RUN rm -f /etc/nova/nova-compute.conf
|
RUN rm -f /etc/nova/nova-compute.conf
|
||||||
@ -120,13 +113,6 @@ RUN rm -f /etc/nova/nova-compute.conf
|
|||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% 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
|
RUN mkdir -p /etc/ceph
|
||||||
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -58,7 +58,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
|
|
||||||
{% if base_distro in ['debian'] %}
|
{% if base_distro in ['debian'] %}
|
||||||
{% set nova_libvirt_packages = nova_libvirt_packages + [
|
{% set nova_libvirt_packages = nova_libvirt_packages + [
|
||||||
'libpam-systemd/stretch-backports',
|
|
||||||
'usermode'
|
'usermode'
|
||||||
] %}
|
] %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
@ -250,7 +250,7 @@ ENV DEBIAN_FRONTEND noninteractive
|
|||||||
'ca-certificates',
|
'ca-certificates',
|
||||||
'git',
|
'git',
|
||||||
'libffi-dev',
|
'libffi-dev',
|
||||||
'libmariadbclient-dev',
|
'libmariadb-dev-compat',
|
||||||
'libpq-dev',
|
'libpq-dev',
|
||||||
'libssl-dev',
|
'libssl-dev',
|
||||||
'libxml2-dev',
|
'libxml2-dev',
|
||||||
|
@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
|
|||||||
|
|
||||||
{% if base_distro == 'debian' %}
|
{% if base_distro == 'debian' %}
|
||||||
{% set rabbitmq_packages = rabbitmq_packages + [
|
{% set rabbitmq_packages = rabbitmq_packages + [
|
||||||
'rabbitmq-server/stretch-backports'
|
'rabbitmq-server',
|
||||||
] %}
|
] %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{% set rabbitmq_packages = rabbitmq_packages + [
|
{% set rabbitmq_packages = rabbitmq_packages + [
|
||||||
|
@ -25,14 +25,14 @@ DEFAULT_BASE_TAGS = {
|
|||||||
'centos': '7',
|
'centos': '7',
|
||||||
'rhel': '7',
|
'rhel': '7',
|
||||||
'oraclelinux': '7-slim',
|
'oraclelinux': '7-slim',
|
||||||
'debian': 'stretch-backports',
|
'debian': 'buster',
|
||||||
'ubuntu': '18.04',
|
'ubuntu': '18.04',
|
||||||
}
|
}
|
||||||
DISTRO_RELEASE = {
|
DISTRO_RELEASE = {
|
||||||
'centos': '7',
|
'centos': '7',
|
||||||
'rhel': '7',
|
'rhel': '7',
|
||||||
'oraclelinux': '7',
|
'oraclelinux': '7',
|
||||||
'debian': 'stretch-backports',
|
'debian': 'buster',
|
||||||
'ubuntu': '18.04',
|
'ubuntu': '18.04',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
5
releasenotes/notes/debian-buster-7bd8be7ec4ce0d13.yaml
Normal file
5
releasenotes/notes/debian-buster-7bd8be7ec4ce0d13.yaml
Normal file
@ -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…
x
Reference in New Issue
Block a user