From 023b9f325285e4a4c9ba8fe6dff54743a4e0cfec Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 20 Oct 2021 15:50:34 +0200 Subject: [PATCH] Debian: enable building Bifrost images on x86-64 https://review.opendev.org/c/openstack/bifrost/+/806328 fixed building of Bifrost Debian images. On AArch64 Bifrost tries to install x86-64 grub. Change-Id: I8e0c55e7995e5269f285c6d9c75e8c4b7b85a38b --- doc/source/matrix_aarch64.csv | 2 +- doc/source/matrix_x86.csv | 2 +- kolla/image/build.py | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index c7c342873b..c6dfc5e567 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -2,7 +2,7 @@ Image,CentOS,,Ubuntu,,Debian ,Binary,Source,Binary,Source,Binary,Source aodh,C,C,C,C,N,C barbican,C,C,C,C,N,C -bifrost,N,C,N,N,N,N +bifrost,N,N,N,N,N,N blazar,N,C,N,C,N,C ceilometer,C,C,C,C,N,C cinder,C,C,C,C,N,C diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 86cf9c6e40..661d62971d 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -2,7 +2,7 @@ Image,CentOS,,Ubuntu,,Debian ,Binary,Source,Binary,Source,Binary,Source aodh,C,C,C,C,C,C barbican,C,T,C,C,C,C -bifrost,N,T,N,C,N,N +bifrost,N,T,N,C,N,C blazar,N,C,N,C,N,C ceilometer,C,C,C,C,C,C cinder,C,T,C,T,C,C diff --git a/kolla/image/build.py b/kolla/image/build.py index ad8ab0ff03..31858e1c06 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -111,8 +111,6 @@ UNBUILDABLE_IMAGES = { }, 'debian': { - "bifrost-base", # tries to install 'mysql-server' which is not in - # Debian 'buster' (fixed in Yoga) "qdrouterd", # no qdrouterd package in Debian bullseye },