openstack/kolla-ansible
Code Issues Proposed changes

Remove ceph as external repo

Browse Source 
* The cloud-archive now provides the most recent version of Ceph
  (hammer) and should be preferred over adding a new repo.
* The ceph signing key changed.[1]

[1] https://securityblog.redhat.com/2015/09/17/important-security-notice-regarding-signing-key-and-distribution-of-red-hat-ceph-storage-on-ubuntu-and-centos/

Change-Id: I5992184f115106a9c853d205d7d79c35e1b0cf27
Closes-Bug: #1497507
This commit is contained in:
Sam Yaple 2015-09-19 05:37:41 +00:00
parent b0cd947c7a
commit 18a32f5e0c
2 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker/base/Dockerfile.j2
View File

@ -198,7 +198,6 @@ COPY sources.list /etc/apt/
RUN apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 199369E5404BD5FC7D2FE43BCBCB082A1BB943DB \
&& apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 391A9AA2147192839E9DB0315EDB1B62EC4926EA \
&& apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
&& apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com 7F6C9F236D170493FCF404F27EBFDD5D17ED316D \
&& apt-get update \
&& apt-get upgrade -y \
&& apt-get dist-upgrade -y \

3
docker/base/sources.list
View File

@ -15,6 +15,3 @@ 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
# Ceph repo
deb http://ceph.com/debian-hammer/ trusty main