diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-20 15:57:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-20 15:57:39 +0000 |
| commit | 6667bcfc971758f70bfa669e3a100b09cc4b809b (patch) | |
| tree | fca8ad78c43660fbca7c6a79a5e11bf5051f8d77 /docker/base | |
| parent | d24004efec1b2fc76aac6bc33b8e5a1a5228f5cf (diff) | |
| parent | 04d6736e89ec48a338e0499ead55b71b8d678db1 (diff) | |
| download | kolla-6667bcfc971758f70bfa669e3a100b09cc4b809b.tar.gz kolla-6667bcfc971758f70bfa669e3a100b09cc4b809b.zip | |
Merge "Pin to Ubuntu 16.04"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/base/sources.list.ubuntu | 20 |
2 files changed, 13 insertions, 11 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 864ec2adb..22a6278f4 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -202,15 +202,17 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences {% set base_apt_packages = [ 'curl', 'gawk', + 'kmod', 'lvm2', 'open-iscsi', 'python', + 'sudo', 'tgt'] %} {% if base_distro == 'ubuntu' %} {% set base_apt_keys = [ - '199369E5404BD5FC7D2FE43BCBCB082A1BB943DB', + '0xF1656F24C74CD1D8', '391A9AA2147192839E9DB0315EDB1B62EC4926EA', '430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A', '08B73419AC32B4E966C1A330E84AC2C0460F3994', diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index 4cabfa07e..b000673c5 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -1,23 +1,23 @@ # Default repos -deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe multiverse -deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse # Backports have a lower priority and must be explicitly installed to be used -deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse +deb http://archive.ubuntu.com/ubuntu/ xenial-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/mitaka main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/newton main # MariaDB 10.0 repo -deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu trusty main +deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu xenial main # Percona repo (for xtrabackup) -deb http://repo.percona.com/apt trusty main +deb http://repo.percona.com/apt xenial main # Ceph repo -deb http://download.ceph.com/debian-hammer/ trusty main +deb http://download.ceph.com/debian-hammer/ xenial main # Elastic repo deb http://packages.elastic.co/elasticsearch/2.x/debian stable main @@ -26,7 +26,7 @@ deb http://packages.elastic.co/elasticsearch/2.x/debian stable main deb http://packages.elastic.co/kibana/4.4/debian stable main # Docker repo -deb http://apt.dockerproject.org/repo ubuntu-trusty main +deb http://apt.dockerproject.org/repo ubuntu-xenial main # InfluxDB repo -deb https://repos.influxdata.com/ubuntu trusty stable +deb https://repos.influxdata.com/ubuntu xenial stable |