diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-02-09 10:03:51 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2021-02-17 09:42:01 +0000 |
| commit | 03adc9ddf88e0e66075df254aa0bdf922fbcb74a (patch) | |
| tree | 19f3a5e0837c534194844aa7cf92e8a2a66afe99 | |
| parent | fc0ebe07c2e88ee000caf43d7ba67ceed7d7a842 (diff) | |
| download | kolla-03adc9ddf88e0e66075df254aa0bdf922fbcb74a.tar.gz kolla-03adc9ddf88e0e66075df254aa0bdf922fbcb74a.zip | |
Fix several issues (Train)
* sensu: drop Ubuntu support
Upstream removed Ubuntu repositories.
Train/Stein only
* Bifrost: pin IPA builder to 2.4.0
Train & earlier
IPA builder master branch now requires diskimage-builder 3.4.0, but
Python 2 is supported only up to DIB 2.38.
This change works around the issue by pinning IPA builder to 2.4.0,
which has a Python 2 compatible dependency on DIB.
Change-Id: Ice125e101a689fd3df9d1cd9a093a026f9747a3e
| -rw-r--r-- | doc/source/matrix_x86.csv | 2 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 3 | ||||
| -rw-r--r-- | docker/bifrost/bifrost-base/build_arg.yml | 3 | ||||
| -rwxr-xr-x | kolla/image/build.py | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 51b3b63ce..0c164d18d 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -86,7 +86,7 @@ rsyslog,C,C,C,C,C,C,N,C sahara,C,C,C,C,C,C,N,C searchlight,N,C,N,C,N,C,N,C senlin,C,C,C,C,C,C,N,C -sensu,C,C,N,N,C,C,N,N +sensu,C,C,N,N,N,N,N,N skydive,C,C,C,C,C,C,N,C solum,N,C,N,C,N,C,N,C storm,C,C,C,C,C,C,N,C diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 4e8e4d121..df69e38d2 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -27,9 +27,6 @@ deb http://packages.treasuredata.com/3/ubuntu/bionic/ bionic contrib # Qdrouterd repo deb http://ppa.launchpad.net/qpid/released/ubuntu/ bionic main -# Sensu repo -deb https://sensu.global.ssl.fastly.net/apt bionic main - # Opendaylight repo deb http://ppa.launchpad.net/odl-team/carbon/ubuntu xenial main diff --git a/docker/bifrost/bifrost-base/build_arg.yml b/docker/bifrost/bifrost-base/build_arg.yml index 7a31245a0..7a14ab99b 100644 --- a/docker/bifrost/bifrost-base/build_arg.yml +++ b/docker/bifrost/bifrost-base/build_arg.yml @@ -4,3 +4,6 @@ skip_start: true install_dib: true create_image_via_dib: false ansible_python_interpreter: /var/lib/kolla/venv/bin/python +# NOTE(mgoddard): IPA builder master branch now requires diskimage-builder +# 3.4.0, but Python 2 is supported only up to DIB 2.38. +ipa_builder_git_branch: "2.4.0" diff --git a/kolla/image/build.py b/kolla/image/build.py index 6f3846089..a1735d34f 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -197,13 +197,13 @@ UNBUILDABLE_IMAGES = { "kibana6", # Only required for CentOS 8 migration. "qdrouterd", # There is no qdrouterd package for ubuntu bionic "rabbitmq-3.7.24", # Required only for CentOS 7 to 8 migration + "sensu-base", # upstream dropped Ubuntu repositories }, 'debian+aarch64': { "skydive-base", # no binary package }, 'ubuntu+aarch64': { - "sensu-base", # no binary package "skydive-base", # no binary package }, @@ -211,7 +211,6 @@ UNBUILDABLE_IMAGES = { "skydive-base", # no binary package }, 'ubuntu+ppc64le': { - "sensu-base", # no binary package "skydive-base", # no binary package }, |