From e0cae62c4aab001fa7b5cc324f178793f4e88f3c Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 9 May 2019 11:47:33 +0100 Subject: Ceph: Update to Nautilus on CentOS and OracleLinux The CentOS Stein OpenStack distribution depends on the Ceph Nautilus release, while Kolla currently deploys Luminous on CentOS. This change switches CentOS and OracleLinux builds to use Ceph Nautilus. Support for auth UID has been removed in the Nautilus release [1][2], so we have removed the --set-uid argument from calls to ceph-authtool. Also ceph-osd bootstrap mode fails when no mon config is provided, so we added --no-mon-config (mon config is injected later after bootstrap). Due to ceph-nfs build issues (ceph upstream nfs-ganesha rpms relied on older version of userspace-rcu, than CentOS Storage SIG packages) we need to move to ceph upstream rpm repos. [1] https://github.com/ceph/ceph/commit/d6def8ba1126209f8dcb40e296977dc2b09a376e [2] http://docs.ceph.com/docs/master/releases/nautilus/ Co-Authored-By: Michal Nasiadka Change-Id: I000398f587c5f4d6cc8995e34e162eebc77bc3e3 Implements: blueprint centos-ceph-nautilus --- docker/ceph/ceph-base/Dockerfile.j2 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docker/ceph/ceph-base') diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index 4aeaca4e4..c3027a031 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -12,10 +12,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set ceph_base_packages = [ 'btrfs-progs', 'ceph', + 'ceph-mgr-dashboard', 'ceph-radosgw', 'e2fsprogs', + 'gdisk', 'hdparm', 'parted', + 'smartmontools', 'xfsprogs' ] %} -- cgit v1.2.3