aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2021-10-20 15:50:34 +0200
committerRadosław Piliszek <radoslaw.piliszek@gmail.com>2021-12-05 19:03:18 +0000
commit023b9f325285e4a4c9ba8fe6dff54743a4e0cfec (patch)
tree22b4e8403bfe3e28bcba1de65f9dd27392d51510
parent8cf23a6c312c5318c05c6e6b97f1a3f7ca34f0e4 (diff)
downloadkolla-023b9f325285e4a4c9ba8fe6dff54743a4e0cfec.tar.gz
kolla-023b9f325285e4a4c9ba8fe6dff54743a4e0cfec.zip
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
-rw-r--r--doc/source/matrix_aarch64.csv2
-rw-r--r--doc/source/matrix_x86.csv2
-rwxr-xr-xkolla/image/build.py2
3 files changed, 2 insertions, 4 deletions
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
index c7c342873..c6dfc5e56 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 86cf9c6e4..661d62971 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 ad8ab0ff0..31858e1c0 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
},