diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-12-01 16:53:33 +0100 |
|---|---|---|
| committer | Radosław Piliszek <radoslaw.piliszek@gmail.com> | 2021-12-05 19:03:10 +0000 |
| commit | 8cf23a6c312c5318c05c6e6b97f1a3f7ca34f0e4 (patch) | |
| tree | db767ab998e4434723e8fb0d3a5f6b3b54751d96 | |
| parent | 0443cee2232bb7cf82e7cc68364b78c71810503c (diff) | |
| download | kolla-8cf23a6c312c5318c05c6e6b97f1a3f7ca34f0e4.tar.gz kolla-8cf23a6c312c5318c05c6e6b97f1a3f7ca34f0e4.zip | |
switch source images to follow master branches
We passed R-17 point.
Watcher and vmtp are disabled due to PrettyTable version conflict.
Change-Id: Ia4cbc70f1dc54a5654ccf770c9a866dcb6fef52a
| -rwxr-xr-x | kolla/common/config.py | 2 | ||||
| -rwxr-xr-x | kolla/image/build.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index fc80ed08f..953a58f21 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -32,7 +32,7 @@ DISTRO_PRETTY_NAME = { 'debian': 'Debian GNU/Linux 11 (bullseye)', 'ubuntu': 'Ubuntu 20.04', } -OPENSTACK_RELEASE = 'xena' +OPENSTACK_RELEASE = 'master' # This is noarch repository so we will use it on all architectures DELOREAN = "https://trunk.rdoproject.org/centos8-xena/" \ diff --git a/kolla/image/build.py b/kolla/image/build.py index 76cd1a859..ad8ab0ff0 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -98,6 +98,11 @@ UNBUILDABLE_IMAGES = { "zun-base", }, + 'source': { + "watcher-base", # https://bugs.launchpad.net/watcher/+bug/1952944 + "vmtp", # https://review.opendev.org/c/x/vmtp/+/820057 + }, + 'centos': { "hacluster-pcs", # Missing crmsh package "nova-spicehtml5proxy", # Missing spicehtml5 package |