openstack/kolla
Code Issues Proposed changes

ceph: stick to luminous on Ubuntu (in proper way)

Browse Source 
Previous attempt broke Debian builds.

Pinning Ceph packages instead of giving version during install.

Change-Id: I791e479ba265ba61ffd882da18f85cdbece67e55
This commit is contained in:
Marcin Juszkiewicz 2018-09-27 09:51:05 +02:00 committed by wangwei
parent 92da071d9d
commit 7826ba2984
2 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/base/apt_preferences.ubuntu
View File

@ -2,3 +2,8 @@
Package: dh-python Package: dh-python
Pin: version 2.20151103ubuntu1 Pin: version 2.20151103ubuntu1
Pin-Priority: 550 Pin-Priority: 550
# We want Ceph/Luminous
Package: ceph* *cephfs* librbd* *rados* python-rbd librgw*
Pin: version 13.*
Pin-Priority: -1

19
docker/ceph/ceph-base/Dockerfile.j2
View File

@ -29,25 +29,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set ceph_base_packages = [ {% set ceph_base_packages = [
'btrfs-tools', 'btrfs-tools',
'ceph=12.2.4-0ubuntu1', 'ceph',
'ceph-mgr=12.2.4-0ubuntu1', 'ceph-mds',
'ceph-mon=12.2.4-0ubuntu1',
'ceph-osd=12.2.4-0ubuntu1',
'ceph-mds=12.2.4-0ubuntu1',
'ceph-base=12.2.4-0ubuntu1',
'ceph-common=12.2.4-0ubuntu1',
'librbd1=12.2.4-0ubuntu1',
'python-cephfs=12.2.4-0ubuntu1',
'python-rados=12.2.4-0ubuntu1',
'python-rbd=12.2.4-0ubuntu1',
'libcephfs2=12.2.4-0ubuntu1',
'librados2=12.2.4-0ubuntu1',
'libradosstriper1=12.2.4-0ubuntu1',
'e2fsprogs', 'e2fsprogs',
'hdparm', 'hdparm',
'parted', 'parted',
'radosgw=12.2.4-0ubuntu1', 'radosgw',
'librgw2=12.2.4-0ubuntu1',
'xfsprogs' 'xfsprogs'
] %} ] %}