From 03adc9ddf88e0e66075df254aa0bdf922fbcb74a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 9 Feb 2021 10:03:51 +0100 Subject: 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 --- docker/base/sources.list.ubuntu | 3 --- docker/bifrost/bifrost-base/build_arg.yml | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'docker') 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" -- cgit v1.2.3