aboutsummaryrefslogtreecommitdiff
path: root/docker_templates/base
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-24 18:42:05 +0000
committerGerrit Code Review <review@openstack.org>2015-08-24 18:42:05 +0000
commit7c83b0e5b977ed66b1c66ed044b6baf80e4bd54d (patch)
tree562514aed0715ad5710cfb0663dc58ea9d4cea2e /docker_templates/base
parentf248eafdfda544ed2c9d6a6bcf9a54a53de33c5e (diff)
parenta070839b1f61e1cdd7bbcb0b943cd1683f19f093 (diff)
downloadkolla-7c83b0e5b977ed66b1c66ed044b6baf80e4bd54d.tar.gz
kolla-7c83b0e5b977ed66b1c66ed044b6baf80e4bd54d.zip
Merge "Ubuntu - Nova"
Diffstat (limited to 'docker_templates/base')
-rw-r--r--docker_templates/base/sources.list8
1 files changed, 5 insertions, 3 deletions
diff --git a/docker_templates/base/sources.list b/docker_templates/base/sources.list
index 331a3b1f0..ccb6f8d25 100644
--- a/docker_templates/base/sources.list
+++ b/docker_templates/base/sources.list
@@ -6,9 +6,11 @@ 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
-# 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/liberty main
+# 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
+# ones are qemu, libvirt, and openvswitch.
+deb http://ubuntu-cloud.archive.canonical.com/ubuntu trusty-updates/kilo main
# MariaDB 10.0 repo
deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main