diff options
| author | Zuul <zuul@review.opendev.org> | 2021-12-08 16:38:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-12-08 16:38:57 +0000 |
| commit | de3ab6ebd43587e61bed27e78c1369f58cced5fc (patch) | |
| tree | d37f0acccad1a873bc67b90f0f607e376d6aff3b | |
| parent | 077f13681c330d5d57583dec90aa46c323d04e33 (diff) | |
| parent | 8cf23a6c312c5318c05c6e6b97f1a3f7ca34f0e4 (diff) | |
| download | kolla-de3ab6ebd43587e61bed27e78c1369f58cced5fc.tar.gz kolla-de3ab6ebd43587e61bed27e78c1369f58cced5fc.zip | |
Merge "switch source images to follow master branches"
| -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 |