Skip to content

Commit 6738372

Browse files
committed
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
1 parent 4b3ad06 commit 6738372

File tree

2 files changed

+4
-44
lines changed

2 files changed

+4
-44
lines changed

docker/base/sources.list.ubuntu

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,6 @@ deb http://archive.ubuntu.com/ubuntu/ focal-backports main universe
1212
# are qemu, libvirt, and openvswitch.
1313
deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/xena main
1414

15-
# NOTE(hrw): repositories below are added into image when they are needed as
15+
# NOTE(hrw): extra repositories are added into image when they are needed as
1616
# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
17-
# are defined in kolla/repos.yaml file.
18-
#
19-
# Here they stay in case someone needs them.
20-
21-
# Elasticsearch, Logstash & Kibana repo
22-
#deb https://artifacts.elastic.co/packages/5.x/apt stable main
23-
24-
# InfluxDB repo
25-
#deb https://repos.influxdata.com/ubuntu focal stable
26-
27-
# Grafana repo
28-
#deb https://packages.grafana.com/oss/deb stable main
29-
30-
# Fluentd repo
31-
#deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib
32-
33-
# Qdrouterd repo
34-
#deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main
35-
36-
# rabbitmq repo
37-
#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
38-
39-
# erlang repo
40-
#deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main
41-
42-
# MariaDB repo
43-
#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main
17+
# are defined in kolla/template/repos.yaml file.

docker/base/sources.list.ubuntu.aarch64

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,6 @@ deb http://ports.ubuntu.com/ focal-backports main universe
1010
# are qemu, libvirt, and openvswitch.
1111
deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/xena main
1212

13-
# NOTE(hrw): repositories below are added into image when they are needed as
13+
# NOTE(hrw): extra repositories are added into image when they are needed as
1414
# separate files in /etc/apt/sources.list.d/ directory. For that purpose they
15-
# are defined in kolla/repos.yaml file.
16-
#
17-
# Here they stay in case someone needs them.
18-
19-
# rabbitmq repo
20-
#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
21-
22-
# Grafana repo
23-
#deb https://packages.grafana.com/oss/deb stable main
24-
25-
# elasticsearch (arch:all), logstash (arch:all), kibana (arch:amd64)
26-
#deb [arch=amd64] https://artifacts.elastic.co/packages/5.x/apt stable main
27-
28-
# MariaDB repo
29-
#deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main
15+
# are defined in kolla/template/repos.yaml file.

0 commit comments

Comments
 (0)