openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove ceph repo for Ubuntu install"

Browse Source
This commit is contained in:
Jenkins 2016-10-17 16:20:58 +00:00 committed by Gerrit Code Review
commit 51f46035e7
4 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

@ -235,7 +235,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
'0xF1656F24C74CD1D8',
'391A9AA2147192839E9DB0315EDB1B62EC4926EA',
'430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A',
'08B73419AC32B4E966C1A330E84AC2C0460F3994',
'46095ACC8548582C1A2699A9D27D666CD88E42B4',
'58118E89F3A912897C070ADBF76221572C52609D',
'05CE15085FC09D18E99EFB22684A14CF2582E0C5',
@ -243,7 +242,6 @@ COPY apt_preferences.{{ base_distro }} /etc/apt/preferences
] %}
{% elif base_distro == 'debian' %}
{% set base_apt_keys = [
'08B73419AC32B4E966C1A330E84AC2C0460F3994',
'58118E89F3A912897C070ADBF76221572C52609D',
'0xcbcb082a1bb943db',
'D27D666CD88E42B4',

4
docker/base/apt_preferences.debian
View File

@ -1,7 +1,3 @@
Package: *
Pin: origin "download.ceph.com"
Pin-Priority: 500
Package: *
Pin: origin "nyc2.mirrors.digitalocean.com"
Pin-Priority: 500

3
docker/base/apt_preferences.ubuntu
View File

@ -1,3 +0,0 @@
Package: *
Pin: origin download.ceph.com
Pin-Priority: 700

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

@ -16,9 +16,6 @@ deb http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.0/ubuntu xenial main
# Percona repo (for xtrabackup)
deb http://repo.percona.com/apt xenial main
# Ceph repo
deb http://download.ceph.com/debian-jewel/ xenial main
# Elastic repo
deb http://packages.elastic.co/elasticsearch/2.x/debian stable main