diff options
| author | Sam Yaple <sam@yaple.net> | 2015-09-15 07:44:18 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-09-16 10:15:00 +0000 |
| commit | 84ea8fbc9d7f10cd47c3c7e3d77359c630d44b2c (patch) | |
| tree | ce3c18fcefcea20862cafc04c8d08977226ba4a8 /docker/base/sources.list | |
| parent | 8cdaf01c0a7a215c80a64cdcbe8b523b5c7d59dd (diff) | |
| download | kolla-84ea8fbc9d7f10cd47c3c7e3d77359c630d44b2c.tar.gz kolla-84ea8fbc9d7f10cd47c3c7e3d77359c630d44b2c.zip | |
Use Liberty cloudarchive repo for Ubuntu
Additionally remove rabbitmq since the correct version is now provided
in cloudarchive repo.
Change-Id: I215f03c4770f3049a9498c36c6ee9e819ce0acae
Closes-Bug: #1495836
Diffstat (limited to 'docker/base/sources.list')
| -rw-r--r-- | docker/base/sources.list | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/docker/base/sources.list b/docker/base/sources.list index e6b6a8503..cabc777a3 100644 --- a/docker/base/sources.list +++ b/docker/base/sources.list @@ -6,11 +6,9 @@ deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe m # Backports have a lower priority and must be explictly installed to be used deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse -# TODO(SamYaple): Switch this to the Liberty repo as soon as the update packages -# and actually start signing them. -# We need to add the Kilo repo for the updated packages they provide. The main +# We need to add the Liberty repo for the updated packages they provide. The main # ones are qemu, libvirt, and openvswitch. -deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/kilo main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/liberty main # MariaDB 10.0 repo deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main @@ -18,8 +16,5 @@ deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main # Percona repo (for xtrabackup) deb http://repo.percona.com/apt trusty main -# RabbitMQ repo. Despite the name, the 'testing' repo is the stable repo. -deb http://www.rabbitmq.com/debian/ testing main - # Ceph repo deb http://ceph.com/debian-hammer/ trusty main |