diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2018-09-27 09:51:05 +0200 |
|---|---|---|
| committer | wangwei <wangwei@navercorp.com> | 2018-09-27 18:05:22 +0900 |
| commit | 7826ba2984911d894ff188be476bc6691290ebc8 (patch) | |
| tree | 0576d48b331da677d94f53ddc90d606282b2b732 /docker | |
| parent | 92da071d9da8476c74ecb16e43e71b276744a863 (diff) | |
| download | kolla-7826ba2984911d894ff188be476bc6691290ebc8.tar.gz kolla-7826ba2984911d894ff188be476bc6691290ebc8.zip | |
ceph: stick to luminous on Ubuntu (in proper way)
Previous attempt broke Debian builds.
Pinning Ceph packages instead of giving version during install.
Change-Id: I791e479ba265ba61ffd882da18f85cdbece67e55
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 5 | ||||
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 19 |
2 files changed, 8 insertions, 16 deletions
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 7f61f0625..83e0da492 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -2,3 +2,8 @@ Package: dh-python Pin: version 2.20151103ubuntu1 Pin-Priority: 550 + +# We want Ceph/Luminous +Package: ceph* *cephfs* librbd* *rados* python-rbd librgw* +Pin: version 13.* +Pin-Priority: -1 diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index 4344f4111..ad1a3ff42 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -29,25 +29,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set ceph_base_packages = [ 'btrfs-tools', - 'ceph=12.2.4-0ubuntu1', - 'ceph-mgr=12.2.4-0ubuntu1', - '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', + 'ceph', + 'ceph-mds', 'e2fsprogs', 'hdparm', 'parted', - 'radosgw=12.2.4-0ubuntu1', - 'librgw2=12.2.4-0ubuntu1', + 'radosgw', 'xfsprogs' ] %} |