From 57f56e70623a5cb9bec3a97a1f05b087c99f1ccd Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 26 Jan 2022 16:25:17 +0100 Subject: Switch to use Yoga binary packages At R-8 week we are moving to current release binary packages for CentOS and Ubuntu (Debian OpenStack team do not publish before RC). Change-Id: I5e620cd07326b3d69b07f7c4667176918d7c1b24 --- docker/base/sources.list.ubuntu | 2 +- docker/base/sources.list.ubuntu.aarch64 | 2 +- kolla/common/config.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index de177d298..c7d072c32 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -10,7 +10,7 @@ deb http://archive.ubuntu.com/ubuntu/ focal-backports main universe # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. -deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/xena main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/yoga main # NOTE(hrw): extra repositories are added into image when they are needed as # separate files in /etc/apt/sources.list.d/ directory. For that purpose they diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64 index 60d0e4f92..b975b017b 100644 --- a/docker/base/sources.list.ubuntu.aarch64 +++ b/docker/base/sources.list.ubuntu.aarch64 @@ -8,7 +8,7 @@ deb http://ports.ubuntu.com/ focal-backports main universe # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. -deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/xena main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/yoga main # NOTE(hrw): extra repositories are added into image when they are needed as # separate files in /etc/apt/sources.list.d/ directory. For that purpose they diff --git a/kolla/common/config.py b/kolla/common/config.py index 85cef0ac5..469666235 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -35,9 +35,9 @@ DISTRO_PRETTY_NAME = { OPENSTACK_RELEASE = 'master' # This is noarch repository so we will use it on all architectures -DELOREAN = "https://trunk.rdoproject.org/centos8-xena/" \ +DELOREAN = "https://trunk.rdoproject.org/centos8-master/" \ "consistent/delorean.repo" -DELOREAN_DEPS = "https://trunk.rdoproject.org/centos8-xena/" \ +DELOREAN_DEPS = "https://trunk.rdoproject.org/centos8-master/" \ "delorean-deps.repo" INSTALL_TYPE_CHOICES = ['binary', 'source'] -- cgit v1.2.3