aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-06-28 20:06:30 +0000
committerGerrit Code Review <review@openstack.org>2021-06-28 20:06:30 +0000
commit314362ff07035b9dbfdcdd1461552f687ca990a2 (patch)
tree22e7d4122d5ce612e188da98bd6d6502d6b15a7b
parent337e9f3f83004969853b0da44fc0ac23be2ab52f (diff)
parent7344e65aa9af18cceaeae1d7d6b0bd3b59402bbc (diff)
downloadkolla-314362ff07035b9dbfdcdd1461552f687ca990a2.tar.gz
kolla-314362ff07035b9dbfdcdd1461552f687ca990a2.zip
Merge "Fix build of debian images"
-rwxr-xr-xkolla/common/config.py2
-rw-r--r--releasenotes/notes/bug-1933770-c08c6804aa5d9e61.yaml6
2 files changed, 7 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 56887b398..37d153732 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -31,7 +31,7 @@ DEFAULT_BASE_TAGS = {
DISTRO_PRETTY_NAME = {
'centos': 'CentOS Stream 8',
'rhel': 'Red Hat Enterprise Linux 8',
- 'debian': 'Debian GNU/Linux bullseye',
+ 'debian': 'Debian GNU/Linux 11 (bullseye)',
'ubuntu': 'Ubuntu 20.04',
}
OPENSTACK_RELEASE = 'wallaby'
diff --git a/releasenotes/notes/bug-1933770-c08c6804aa5d9e61.yaml b/releasenotes/notes/bug-1933770-c08c6804aa5d9e61.yaml
new file mode 100644
index 000000000..029338972
--- /dev/null
+++ b/releasenotes/notes/bug-1933770-c08c6804aa5d9e61.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - |
+ Fixes debian image build failure caused by the official
+ Debian bullseye release changing the os identification.
+ `LP#1933770 <https://launchpad.net/bugs/1933770>`__