Browse Source

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
changes/02/774602/2
Marcin Juszkiewicz 2 months ago
committed by Mark Goddard
parent
commit
03adc9ddf8
4 changed files with 5 additions and 6 deletions
  1. +1
    -1
      doc/source/matrix_x86.csv
  2. +0
    -3
      docker/base/sources.list.ubuntu
  3. +3
    -0
      docker/bifrost/bifrost-base/build_arg.yml
  4. +1
    -2
      kolla/image/build.py

+ 1
- 1
doc/source/matrix_x86.csv View File

@ -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


+ 0
- 3
docker/base/sources.list.ubuntu View File

@ -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


+ 3
- 0
docker/bifrost/bifrost-base/build_arg.yml View File

@ -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"

+ 1
- 2
kolla/image/build.py View File

@ -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
},


Loading…
Cancel
Save