From 7826ba2984911d894ff188be476bc6691290ebc8 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Thu, 27 Sep 2018 09:51:05 +0200
Subject: [PATCH] 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
---
 docker/base/apt_preferences.ubuntu  |  5 +++++
 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 7f61f0625c..83e0da4923 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 4344f41110..ad1a3ff42c 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'
     ] %}