diff options
| -rw-r--r-- | community/ceph/APKBUILD | 19 | ||||
| -rw-r--r-- | community/ceph/ceph-user.pre-install (renamed from community/ceph/ceph-common.pre-install) | 0 |
2 files changed, 16 insertions, 3 deletions
diff --git a/community/ceph/APKBUILD b/community/ceph/APKBUILD index 5bbc61ef4c..e246b0a1fa 100644 --- a/community/ceph/APKBUILD +++ b/community/ceph/APKBUILD @@ -99,6 +99,7 @@ subpackages=" $pkgname-mon-daemon:mon_daemon $pkgname-mon-tools:mon_tools $pkgname-fuse:ceph_fuse + $pkgname-openrc $pkgname-osd $pkgname-osd-daemon:osd_daemon $pkgname-osd-tools:osd_tools @@ -106,6 +107,7 @@ subpackages=" $pkgname-radosgw $pkgname-bash-completion:bash_completion:noarch $pkgname-dev + $pkgname-user rbd-fuse:rbd_fuse rbd-mirror:rbd_mirror rbd-nbd:rbd_nbd @@ -210,9 +212,21 @@ check() { ctest } +# This subpackage is a little weird and a side effect of trying to keep +# the daemon packages as small as possible. We might be able to roll this into +# the base/common package later if we can slim those down or break them up in a +# different way +user() { + pkgdesc="Minimal package to create a user for other ceph packages." + depends="" + install="$pkgname-user.pre-install" + mkdir -p "$subpkgdir" +} + base() { pkgdesc="Base is the package that includes all the files shared amongst ceph servers" depends="$_base_deps + ceph-user=$pkgver-r$pkgrel ceph-common=$pkgver-r$pkgrel librbd=$pkgver-r$pkgrel librados=$pkgver-r$pkgrel @@ -245,7 +259,6 @@ base() { common() { pkgdesc="Common utilities to mount and interact with a ceph storage cluster." depends="py3-rados py3-rbd py3-cephfs" - install="$pkgname-common.pre-install" _pkg $_bindir ceph \ ceph-authtool \ @@ -297,7 +310,7 @@ mon() { mon_daemon() { pkgdesc="Cluster monitor daemon for the Ceph distributed file system." - depends="" + depends="ceph-user=$pkgver-r$pkgrel" _pkg $_bindir ceph-mon install -m 750 -o $_ceph_uid -g $_ceph_gid -d \ @@ -359,7 +372,7 @@ osd() { osd_daemon() { pkgdesc="Object storage daemon for the Ceph distributed file system." - depends="$_osd_daemon_deps" + depends="$_osd_daemon_deps ceph-user=$pkgver-r$pkgrel" _pkg $_bindir ceph-osd _pkg $_libexecdir/ceph ceph-osd-prestart.sh diff --git a/community/ceph/ceph-common.pre-install b/community/ceph/ceph-user.pre-install index bae4f09dc7..bae4f09dc7 100644 --- a/community/ceph/ceph-common.pre-install +++ b/community/ceph/ceph-user.pre-install |