openstack
/
kolla
Code Issues Proposed changes

Merge "ubuntu: use Antelope UCA"

This commit is contained in:
Zuul 2023-05-18 20:37:31 +00:00 committed by Gerrit Code Review
parent cfc05b7eb6 665357248d
commit 58030f8677
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/sources.list.ubuntu
View File

@ -10,7 +10,7 @@ deb http://archive.ubuntu.com/ubuntu/ jammy-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 jammy-updates/zed main
deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/antelope 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

2
docker/base/sources.list.ubuntu.aarch64
View File

@ -8,7 +8,7 @@ deb http://ports.ubuntu.com/ jammy-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 jammy-updates/zed main
deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/antelope 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

1
tests/templates/template_overrides.j2
View File

@ -71,7 +71,6 @@ RUN sed -i -e "s|http://deb.debian.org|[trusted=yes] http://{{ nodepool_mirror_h
{% elif base_distro == "ubuntu" %}
RUN sed -i -e "s|mirror://mirrors.ubuntu.com/mirrors.txt|[trusted=yes] http://{{ nodepool_mirror_host }}/ubuntu/|" \
-e "s|http://ubuntu-cloud.archive.canonical.com/ubuntu|[trusted=yes] http://{{ nodepool_mirror_host }}/ubuntu-cloud-archive|" \
-e "s|http://ports.ubuntu.com|[trusted=yes] http://{{ nodepool_mirror_host }}/ubuntu-ports|" \
/etc/apt/sources.list