diff options
| author | Michal Arbet <michal.arbet@ultimum.io> | 2021-06-27 22:05:25 +0200 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-06-28 16:50:13 +0000 |
| commit | 7344e65aa9af18cceaeae1d7d6b0bd3b59402bbc (patch) | |
| tree | 3140b27a2a9fbc3200efac00265cbdebe5229e1c | |
| parent | 8e020c5f86e033d9baba2c80c39f800bbd3cf2de (diff) | |
| download | kolla-7344e65aa9af18cceaeae1d7d6b0bd3b59402bbc.tar.gz kolla-7344e65aa9af18cceaeae1d7d6b0bd3b59402bbc.zip | |
Fix build of debian images
Kolla expects different PRETTY_NAME var as
debian defined in /etc/os-release. Therefore
bullseye debian images build is failing.
This patch is changing what kolla expects in
PRETTY_NAME var and fixing build of debian images.
Closes-Bug: #1933770
Change-Id: Ie276b7877ca2edd31dd7a107d70b75ae1735f744
| -rwxr-xr-x | kolla/common/config.py | 2 | ||||
| -rw-r--r-- | releasenotes/notes/bug-1933770-c08c6804aa5d9e61.yaml | 6 |
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>`__ |