openstack
/
kolla
Code Issues Proposed changes

base: drop commented repositories 

We moved additional Debian/Ubuntu repositories into
kolla/template/repos.yaml quite a while ago. It is time to
drop commented out copies from APT sources.list file as no one keeps
them in sync.

Change-Id: I2bb89a30a88c8b889c5af2fc609e236ed966f7ba
This commit is contained in:
Marcin Juszkiewicz 2021-10-28 12:55:37 +02:00
parent 4b3ad066d1
commit 6738372ae6
2 changed files with 4 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,32 +12,6 @@ deb http://archive.ubuntu.com/ubuntu/ focal-backports main universe
# are qemu, libvirt, and openvswitch.
deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/xena main
# NOTE(hrw): repositories below are added into image when they are needed as
# 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
# are defined in kolla/repos.yaml file.
#
# Here they stay in case someone needs them.
# Elasticsearch, Logstash & Kibana repo
#deb https://artifacts.elastic.co/packages/5.x/apt stable main
# InfluxDB repo
#deb https://repos.influxdata.com/ubuntu focal stable
# Grafana repo
#deb https://packages.grafana.com/oss/deb stable main
# Fluentd repo
#deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib
# Qdrouterd repo
#deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main
# rabbitmq repo
#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
# erlang repo
#deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main
# MariaDB repo
#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main
# are defined in kolla/template/repos.yaml file.

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

@ -10,20 +10,6 @@ deb http://ports.ubuntu.com/ focal-backports main universe
# are qemu, libvirt, and openvswitch.
deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/xena main
# NOTE(hrw): repositories below are added into image when they are needed as
# 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
# are defined in kolla/repos.yaml file.
#
# Here they stay in case someone needs them.
# rabbitmq repo
#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
# Grafana repo
#deb https://packages.grafana.com/oss/deb stable main
# elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64)
#deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
# MariaDB repo
#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main
# are defined in kolla/template/repos.yaml file.