[Pkg-ceph-commits] [ceph] 02/02: * d/*: Split ceph-osd and ceph-mon into separate binary packages and add new ceph-base binary package inline with upstream packaging changes (LP: #1596063).
James Downing Page
jamespage at moszumanska.debian.org
Thu Jun 30 10:19:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu-yakkety
in repository ceph.
commit 38f0354c5ed469dc1e52b0f18e53d63a25b15f93
Author: James Page <james.page at ubuntu.com>
Date: Thu Jun 30 11:18:57 2016 +0100
* d/*: Split ceph-osd and ceph-mon into separate binary packages and add
new ceph-base binary package inline with upstream packaging changes
(LP: #1596063).
---
debian/{ceph.dirs => ceph-base.dirs} | 2 -
debian/{ceph.install => ceph-base.install} | 16 -----
debian/ceph-base.lintian-overrides | 29 +++++++++
debian/{ceph.logrotate => ceph-base.logrotate} | 0
debian/{ceph.postinst => ceph-base.postinst} | 0
debian/{ceph.postrm => ceph-base.postrm} | 0
debian/{ceph.prerm => ceph-base.prerm} | 0
debian/ceph-mon.dirs | 1 +
debian/ceph-mon.install | 5 ++
debian/ceph-mon.postinst | 45 ++++++++++++++
debian/ceph-mon.prerm | 23 +++++++
debian/ceph-osd.dirs | 1 +
debian/ceph-osd.install | 13 ++++
debian/ceph-osd.postinst | 45 ++++++++++++++
debian/ceph-osd.prerm | 23 +++++++
debian/ceph.examples | 1 -
debian/ceph.lintian-overrides | 29 ---------
debian/changelog | 5 +-
debian/control | 85 +++++++++++++++++++++++---
19 files changed, 265 insertions(+), 58 deletions(-)
diff --git a/debian/ceph.dirs b/debian/ceph-base.dirs
similarity index 74%
rename from debian/ceph.dirs
rename to debian/ceph-base.dirs
index b948689..9881b83 100644
--- a/debian/ceph.dirs
+++ b/debian/ceph-base.dirs
@@ -1,6 +1,4 @@
var/lib/ceph/bootstrap-mds
var/lib/ceph/bootstrap-osd
var/lib/ceph/bootstrap-rgw
-var/lib/ceph/mon
-var/lib/ceph/osd
var/lib/ceph/tmp
diff --git a/debian/ceph.install b/debian/ceph-base.install
similarity index 57%
rename from debian/ceph.install
rename to debian/ceph-base.install
index d956854..8e1f092 100644
--- a/debian/ceph.install
+++ b/debian/ceph-base.install
@@ -1,37 +1,21 @@
## install from source tree
etc/bash_completion.d/ceph
-udev/95-ceph-osd.rules lib/udev/rules.d
-usr/bin/ceph-bluefs-tool
-usr/bin/ceph-clsinfo
usr/bin/ceph-debugpack
-usr/bin/ceph-mon
-usr/bin/ceph-objectstore-tool
-usr/bin/ceph-osd
-usr/bin/ceph-rest-api
usr/bin/ceph-run
usr/bin/crushtool
usr/bin/monmaptool
usr/bin/osdmaptool
-usr/lib/*/ceph/ceph-osd-prestart.sh /usr/lib/ceph/
usr/lib/*/ceph/ceph_common.sh
usr/lib/*/ceph/erasure-code/libec_*.so
usr/lib/*/rados-classes/*.so
usr/lib/python*/dist-packages/ceph_detect_init*
-usr/lib/python*/dist-packages/ceph_disk*
-usr/lib/python*/dist-packages/ceph_rest_api.py
usr/sbin/ceph-create-keys
usr/sbin/ceph-detect-init
-usr/sbin/ceph-disk
usr/share/doc/ceph/sample.ceph.conf
usr/share/doc/ceph/sample.fetch_config
-usr/share/man/man8/ceph-clsinfo.8
usr/share/man/man8/ceph-create-keys.8
usr/share/man/man8/ceph-debugpack.8
usr/share/man/man8/ceph-detect-init.8
-usr/share/man/man8/ceph-disk.8
-usr/share/man/man8/ceph-mon.8
-usr/share/man/man8/ceph-osd.8
-usr/share/man/man8/ceph-rest-api.8
usr/share/man/man8/ceph-run.8
usr/share/man/man8/crushtool.8
usr/share/man/man8/monmaptool.8
diff --git a/debian/ceph-base.lintian-overrides b/debian/ceph-base.lintian-overrides
new file mode 100644
index 0000000..91955c4
--- /dev/null
+++ b/debian/ceph-base.lintian-overrides
@@ -0,0 +1,29 @@
+# False-positives:
+spelling-error-in-binary * tEH the
+
+# Ceph upstart configurations don't have init.d equivalents
+ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-create-keys
+ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-create-keys
+ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon
+ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-mon
+ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd-all
+ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-osd-all
+ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon-all
+ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-mon-all
+ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd
+ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-osd
+ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-all
+ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-all
+ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon-all-starter
+ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-mon-all-starter
+ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd-all-starter
+ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-osd-all-starter
+ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon-all-starter
+ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd
+ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd-all
+ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon
+ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-create-keys
+ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon-all
+ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/rbdmap
+ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-all
+ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd-all-starter
diff --git a/debian/ceph.logrotate b/debian/ceph-base.logrotate
similarity index 100%
rename from debian/ceph.logrotate
rename to debian/ceph-base.logrotate
diff --git a/debian/ceph.postinst b/debian/ceph-base.postinst
similarity index 100%
rename from debian/ceph.postinst
rename to debian/ceph-base.postinst
diff --git a/debian/ceph.postrm b/debian/ceph-base.postrm
similarity index 100%
rename from debian/ceph.postrm
rename to debian/ceph-base.postrm
diff --git a/debian/ceph.prerm b/debian/ceph-base.prerm
similarity index 100%
rename from debian/ceph.prerm
rename to debian/ceph-base.prerm
diff --git a/debian/ceph-mon.dirs b/debian/ceph-mon.dirs
new file mode 100644
index 0000000..e2845f6
--- /dev/null
+++ b/debian/ceph-mon.dirs
@@ -0,0 +1 @@
+var/lib/ceph/mon
diff --git a/debian/ceph-mon.install b/debian/ceph-mon.install
new file mode 100644
index 0000000..9d08093
--- /dev/null
+++ b/debian/ceph-mon.install
@@ -0,0 +1,5 @@
+usr/bin/ceph-mon
+usr/bin/ceph-rest-api
+usr/share/man/man8/ceph-mon.8
+usr/share/man/man8/ceph-rest-api.8
+usr/lib/python*/dist-packages/ceph_rest_api.py*
diff --git a/debian/ceph-mon.postinst b/debian/ceph-mon.postinst
new file mode 100644
index 0000000..b33f34b
--- /dev/null
+++ b/debian/ceph-mon.postinst
@@ -0,0 +1,45 @@
+# vim: set noet ts=8:
+# postinst script for ceph-mon
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#
+# postinst configure <most-recently-configured-version>
+# old-postinst abort-upgrade <new-version>
+# conflictor's-postinst abort-remove in-favour <package> <new-version>
+# postinst abort-remove
+# deconfigured's-postinst abort-deconfigure in-favour <failed-install-package> <version> [<removing conflicting-package> <version>]
+#
+
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+[ -f "/etc/default/ceph" ] && . /etc/default/ceph
+[ -z "$SERVER_USER" ] && SERVER_USER=ceph
+[ -z "$SERVER_GROUP" ] && SERVER_GROUP=ceph
+
+case "$1" in
+ configure)
+ [ -x /sbin/start ] && start ceph-mon-all || :
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ :
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/ceph-mon.prerm b/debian/ceph-mon.prerm
new file mode 100644
index 0000000..5f64058
--- /dev/null
+++ b/debian/ceph-mon.prerm
@@ -0,0 +1,23 @@
+#!/bin/sh
+# vim: set noet ts=8:
+
+set -e
+
+case "$1" in
+ remove)
+ [ -x /sbin/stop ] && stop ceph-mon-all || true
+ invoke-rc.d ceph stop mon || {
+ RESULT=$?
+ if [ $RESULT != 100 ]; then
+ exit $RESULT
+ fi
+ }
+ ;;
+
+ *)
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/ceph-osd.dirs b/debian/ceph-osd.dirs
new file mode 100644
index 0000000..b7fc476
--- /dev/null
+++ b/debian/ceph-osd.dirs
@@ -0,0 +1 @@
+var/lib/ceph/osd
diff --git a/debian/ceph-osd.install b/debian/ceph-osd.install
new file mode 100644
index 0000000..78c3273
--- /dev/null
+++ b/debian/ceph-osd.install
@@ -0,0 +1,13 @@
+lib/udev/rules.d/95-ceph-osd.rules
+usr/sbin/ceph-disk
+usr/sbin/ceph-disk-udev
+usr/bin/ceph-clsinfo
+usr/bin/ceph-objectstore-tool
+usr/bin/ceph-bluefs-tool
+usr/bin/ceph_objectstore_bench
+usr/bin/ceph-osd
+usr/lib/ceph/ceph-osd-prestart.sh
+usr/share/man/man8/ceph-clsinfo.8
+usr/share/man/man8/ceph-disk.8
+usr/share/man/man8/ceph-osd.8
+usr/lib/python*/dist-packages/ceph_disk*
diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst
new file mode 100644
index 0000000..b642dfe
--- /dev/null
+++ b/debian/ceph-osd.postinst
@@ -0,0 +1,45 @@
+# vim: set noet ts=8:
+# postinst script for ceph-osd
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#
+# postinst configure <most-recently-configured-version>
+# old-postinst abort-upgrade <new-version>
+# conflictor's-postinst abort-remove in-favour <package> <new-version>
+# postinst abort-remove
+# deconfigured's-postinst abort-deconfigure in-favour <failed-install-package> <version> [<removing conflicting-package> <version>]
+#
+
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+[ -f "/etc/default/ceph" ] && . /etc/default/ceph
+[ -z "$SERVER_USER" ] && SERVER_USER=ceph
+[ -z "$SERVER_GROUP" ] && SERVER_GROUP=ceph
+
+case "$1" in
+ configure)
+ [ -x /sbin/start ] && start ceph-osd-all || :
+ ;;
+ abort-upgrade|abort-remove|abort-deconfigure)
+ :
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/ceph-osd.prerm b/debian/ceph-osd.prerm
new file mode 100644
index 0000000..40f07b6
--- /dev/null
+++ b/debian/ceph-osd.prerm
@@ -0,0 +1,23 @@
+#!/bin/sh
+# vim: set noet ts=8:
+
+set -e
+
+case "$1" in
+ remove)
+ [ -x /sbin/stop ] && stop ceph-osd-all || true
+ invoke-rc.d ceph stop osd || {
+ RESULT=$?
+ if [ $RESULT != 100 ]; then
+ exit $RESULT
+ fi
+ }
+ ;;
+
+ *)
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/ceph.examples b/debian/ceph.examples
deleted file mode 100644
index 0bd85b6..0000000
--- a/debian/ceph.examples
+++ /dev/null
@@ -1 +0,0 @@
-debian/etc/default/ceph
diff --git a/debian/ceph.lintian-overrides b/debian/ceph.lintian-overrides
deleted file mode 100644
index 9568da6..0000000
--- a/debian/ceph.lintian-overrides
+++ /dev/null
@@ -1,29 +0,0 @@
-# False-positives:
-spelling-error-in-binary * tEH the
-
-# Ceph upstart configurations don't have init.d equivalents
-ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-create-keys
-ceph: init.d-script-not-included-in-package etc/init.d/ceph-create-keys
-ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon
-ceph: init.d-script-not-included-in-package etc/init.d/ceph-mon
-ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd-all
-ceph: init.d-script-not-included-in-package etc/init.d/ceph-osd-all
-ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon-all
-ceph: init.d-script-not-included-in-package etc/init.d/ceph-mon-all
-ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd
-ceph: init.d-script-not-included-in-package etc/init.d/ceph-osd
-ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-all
-ceph: init.d-script-not-included-in-package etc/init.d/ceph-all
-ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon-all-starter
-ceph: init.d-script-not-included-in-package etc/init.d/ceph-mon-all-starter
-ceph: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd-all-starter
-ceph: init.d-script-not-included-in-package etc/init.d/ceph-osd-all-starter
-ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon-all-starter
-ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd
-ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd-all
-ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon
-ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-create-keys
-ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon-all
-ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/rbdmap
-ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-all
-ceph: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd-all-starter
diff --git a/debian/changelog b/debian/changelog
index ecebf24..ac34166 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,10 @@
ceph (10.2.2-0ubuntu2) UNRELEASED; urgency=medium
- * d/ceph.install,d/etc/*: Drop pm based power management scripts; they
+ * d/ceph.install,d/etc/*: Drop pm based power management scripts as they
are not used under systemd (LP: #1455097).
+ * d/*: Split ceph-osd and ceph-mon into separate binary packages and add
+ new ceph-base binary package inline with upstream packaging changes
+ (LP: #1596063).
-- James Page <james.page at ubuntu.com> Thu, 30 Jun 2016 10:52:37 +0100
diff --git a/debian/control b/debian/control
index 6b2a02d..1d1bbeb 100644
--- a/debian/control
+++ b/debian/control
@@ -37,10 +37,10 @@ Build-Depends: cython,
libfuse-dev,
libgoogle-perftools-dev [i386 amd64 powerpc armhf arm64 ppc64el],
libkeyutils-dev,
+ libldap2-dev,
libleveldb-dev,
libnss3-dev,
libsnappy-dev,
- libldap2-dev,
libtool,
libudev-dev,
libxml2-dev,
@@ -65,23 +65,33 @@ XS-Testsuite: autopkgtest
Package: ceph
Architecture: linux-any
+Depends: ceph-mon (= ${binary:Version}), ceph-osd (= ${binary:Version})
+Suggests: ceph-mds (= ${binary:Version})
+Description: distributed storage and file system
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+
+Package: ceph-base
+Architecture: linux-any
Depends: binutils,
ceph-common (= ${binary:Version}),
cryptsetup-bin | cryptsetup,
gdisk,
hdparm | sdparm,
parted,
- python-flask,
uuid-runtime,
xfsprogs,
${misc:Depends},
${python:Depends},
${shlibs:Depends}
Pre-Depends: ${misc:Pre-Depends}
-Breaks: ceph-common (<< 9.2.0-0ubuntu1~),
+Breaks: ceph (<< 10.2.2-0ubuntu2~),
+ ceph-common (<< 9.2.0-0ubuntu1~),
ceph-test (<< 9.2.0-0ubuntu1~),
python-ceph (<< 0.94.1-1~)
-Replaces: ceph-common (<< 9.2.0-0ubuntu1~),
+Replaces: ceph (<< 10.2.2-0ubuntu2~),
+ ceph-common (<< 9.2.0-0ubuntu1~),
ceph-test (<< 9.2.0-0ubuntu1~),
python-ceph (<< 0.94.1-1~)
Recommends: libcephfs1,
@@ -90,14 +100,13 @@ Recommends: libcephfs1,
librbd1,
ntp | time-daemon | chrony
Suggests: logrotate
-Description: distributed storage and file system
+Description: common ceph daemon libraries and management tools
Ceph is a distributed storage system designed to provide excellent
performance, reliability, and scalability.
.
- This package contains all server daemons and management tools for creating,
- running, and administering a Ceph storage cluster, with the exception of the
- metadata server, which is necessary for using the distributed file system
- and is provided by the ceph-mds package.
+ This package contains the libraries and management tools that are common among
+ the three Ceph server daemons (ceph-mon, ceph-osd, ceph-mds). These tools are
+ necessary for creating, running, and administering a Ceph storage cluster.
Package: ceph-dbg
Architecture: linux-any
@@ -227,6 +236,64 @@ Description: debugging symbols for ceph-mds
.
This package contains the debugging symbols for ceph-mds.
+Package: ceph-mon
+Architecture: linux-any
+Depends: ceph-base (= ${binary:Version}),
+ python-flask,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: ceph-common
+Replaces: ceph (<< 10.2.2-0ubuntu2~)
+Breaks: ceph (<< 10.2.2-0ubuntu2~)
+Description: monitor server for the ceph storage system
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains the cluster monitor daemon for the Ceph storage
+ system. One or more instances of ceph-mon form a Paxos part-time parliament
+ cluster that provides extremely reliable and durable storage of cluster
+ membership, configuration, and state.
+
+Package: ceph-mon-dbg
+Architecture: linux-any
+Section: debug
+Priority: extra
+Depends: ceph-mon (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for ceph-mon
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains the debugging symbols for ceph-mon.
+
+Package: ceph-osd
+Architecture: linux-any
+Depends: ceph-base (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Recommends: ceph-common (= ${binary:Version})
+Replaces: ceph (<< 10.2.2-0ubuntu2~)
+Breaks: ceph (<< 10.2.2-0ubuntu2~)
+Description: OSD server for the ceph storage system
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains the Object Storage Daemon for the Ceph storage system.
+ It is responsible for storing objects on a local file system
+ and providing access to them over the network.
+
+Package: ceph-osd-dbg
+Architecture: linux-any
+Section: debug
+Priority: extra
+Depends: ceph-osd (= ${binary:Version}), ${misc:Depends}
+Description: debugging symbols for ceph-osd
+ Ceph is a massively scalable, open-source, distributed
+ storage system that runs on commodity hardware and delivers object,
+ block and file system storage.
+ .
+ This package contains the debugging symbols for ceph-osd.
+
Package: ceph-fuse
Architecture: amd64
Depends: ${misc:Depends}, ${shlibs:Depends}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list