diff options
| author | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2020-05-21 10:09:10 +0200 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-05-21 08:16:55 +0000 |
| commit | a170353b47d359e39f29cd951f73507b07fefb04 (patch) | |
| tree | 4949df5431aa8be28d7a155f2c09bb6facf4f8d7 /kolla/image | |
| parent | 1ebb97c9f266e9be222d53d423031c75b2eb3ea4 (diff) | |
| download | kolla-a170353b47d359e39f29cd951f73507b07fefb04.tar.gz kolla-a170353b47d359e39f29cd951f73507b07fefb04.zip | |
Make Cyborg buildable (again)
This is done by removing the dependency on OPAE SDK.
Additionally, cursive is no longer tried to be installed again
in the agent image as it is already installed in base via regular
requirements.
Details in reno and the referenced bug report.
Change-Id: Ib6a6f38efd9860851e558f13ee3bdedd8bb57903
Closes-bug: #1873744
Diffstat (limited to 'kolla/image')
| -rwxr-xr-x | kolla/image/build.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/kolla/image/build.py b/kolla/image/build.py index 134df5964..3794ae53e 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -80,7 +80,6 @@ STATUS_ERRORS = (STATUS_CONNECTION_ERROR, STATUS_PUSH_ERROR, # is irrelevant. Otherwise all must match for skip to happen. UNBUILDABLE_IMAGES = { 'aarch64': { - "cyborg-base", # no binary package "monasca-grafana", # no phantomJS on aarch64 "opendaylight", # no binary package "prometheus-mtail", # no aarch64 binary @@ -88,7 +87,6 @@ UNBUILDABLE_IMAGES = { }, 'ppc64le': { - "cyborg-base", # no binary package "elasticsearch", # no binary package "grafana", # no binary package "monasca-grafana", # no phantomJS @@ -102,6 +100,7 @@ UNBUILDABLE_IMAGES = { 'source': { "tripleoclient", }, + 'binary': { "bifrost-base", "blazar-base", @@ -134,7 +133,6 @@ UNBUILDABLE_IMAGES = { }, 'centos': { - "cyborg-base", # package only for CentOS 7 "hacluster-pcs", # Missing crmsh package "mongodb", # Missing mongodb and mongodb-server packages "nova-spicehtml5proxy", # Missing spicehtml5 package @@ -144,14 +142,9 @@ UNBUILDABLE_IMAGES = { "tgtd", # Not supported on CentOS 8 }, - 'centos+source': { - "cyborg-agent", # opae-sdk does not support CentOS 8 - }, - 'debian': { "bifrost-base", # tries to install 'mysql-server' which is not in # Debian 'buster' - "cyborg-base", "monasca-grafana", # FIXME(hrw): some ssl issues to fix "mongodb", "opendaylight", # no binary package @@ -159,8 +152,8 @@ UNBUILDABLE_IMAGES = { "qdrouterd", "sensu-base", }, + 'ubuntu': { - "cyborg-base", "qdrouterd", # There is no qdrouterd package for ubuntu bionic }, |