diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/.gitignore | 2 | ||||
| -rw-r--r-- | debian/ceph-kdump-copy.default | 33 | ||||
| -rw-r--r-- | debian/ceph-kdump-copy.init | 69 | ||||
| -rw-r--r-- | debian/ceph-kdump-copy.install | 1 | ||||
| -rw-r--r-- | debian/ceph.dirs | 3 | ||||
| -rw-r--r-- | debian/ceph.install | 2 | ||||
| -rw-r--r-- | debian/control | 89 | ||||
| -rw-r--r-- | debian/gceph.install | 2 | ||||
| -rw-r--r-- | debian/radosgw.dirs | 1 | ||||
| -rwxr-xr-x | debian/rules | 13 |
10 files changed, 41 insertions, 174 deletions
diff --git a/debian/.gitignore b/debian/.gitignore index b7ad8ec5297..3c4c6e32e00 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -21,8 +21,6 @@ /librbd1 /radosgw-dbg /radosgw -/gceph-dbg -/gceph /obsync /python-ceph /tmp diff --git a/debian/ceph-kdump-copy.default b/debian/ceph-kdump-copy.default deleted file mode 100644 index e62dd31e650..00000000000 --- a/debian/ceph-kdump-copy.default +++ /dev/null @@ -1,33 +0,0 @@ -# ceph-kdump-copy configuration -# --------------------------------------------------------------------------- - -# --------------------------------------------------------------------------- -# Remote host information: -# -# These first two MUST be specified -# KDUMP_HOST - The remote host to which kdumps will be copied. -# KDUMP_HOST_USER - The ssh user on KDUMP_HOST that has write -# permission in KDUMP_HOST_COREDIR. -KDUMP_HOST="YOU_MUST_SPECIFY_THIS" -KDUMP_HOST_USER="YOU_MUST_SPECIFY_THIS_TOO" - -# KDUMP_HOST_COREDIR - Full path to the directory on KDUMP_HOST that -# will contain copied kdumps. If not set, "/var/crash/remote" is -# the default. -# KDUMP_HOST_COREDIR="/var/crash/remote" - -# KDUMP_HOST_MY_ID - Name for "me", used as the directory name -# under KDUMP_HOST_COREDIR under which all kdumps from this -# host are placed. Each kdump is identified by a date stamp. -# If not set, "$(hostname)" is the default. -# KDUMP_HOST_MY_ID="$(hostname)" - -# --------------------------------------------------------------------------- -# Local host information: -# -# The local directory in which dumps are saved. If not set, "/var/crash" -# is the default. -# KDUMP_COREDIR="/var/crash" - -# --------------------------------------------------------------------------- -# Architecture specific Overrides: diff --git a/debian/ceph-kdump-copy.init b/debian/ceph-kdump-copy.init deleted file mode 100644 index 617d9589021..00000000000 --- a/debian/ceph-kdump-copy.init +++ /dev/null @@ -1,69 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: ceph-kdump-copy -# Required-Start: $remote_fs $network $named -# Required-Stop: $remote_fs $network $named -# Default-Start: 2 -# Default-Stop: 6 -# Short-Description: Copies kdump crash files to remote server -# Description: This file is used to move crash files generated -# by Ubuntu apport via the kdump init script to a -# remote host. -### END INIT INFO - -# Author: Alex Elder <elder@dreamhost.com> - -# To install and activate this init script: -# update-rc.d ceph-kdump-copy start 02 2 . -# To deactivate and uninstall this init script: -# update-rc.d -f ceph-kdump-copy remove - -# PATH should only include /usr/* if it runs after the mountnfs.sh script -PATH="/sbin:/usr/sbin:/bin:/usr/bin" -DESC="Copies kdump crash files to remote server" -NAME="ceph-kdump-copy" -SCRIPTNAME="/etc/init.d/${NAME}" -CONFIGFILE="/etc/default/${NAME}" - -# Exit if the copy command is not installed -[ -x "/usr/bin/ceph-kdump-copy" ] || exit 0 - -# Read configuration variable file if it is present -[ -r "${CONFIGFILE}" ] && . "${CONFIGFILE}" - -[ -z "${KDUMP_HOST}" ] && - err "please specify KDUMP_HOST in '${CONFIGFILE}'" -[ -z "${KDUMP_HOST_USER}" ] && - err "please specify KDUMP_HOST_USER in '${CONFIGFILE}'" -export KDUMP_HOST KDUMP_HOST_USER - -# Load the VERBOSE setting and other rcS variables -. /lib/init/vars.sh - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.2-14) to ensure that this file is present -# and status_of_proc is working. -. /lib/lsb/init-functions - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_action_begin_msg "Copying kdump files" - /usr/bin/ceph-kdump-copy - if [ "$?" -eq 0 ]; then - [ "$VERBOSE" != no ] && log_end_msg 0 - else - [ "$VERBOSE" != no ] && log_end_msg 1 - fi - ;; - stop) # No-op - ;; - status|reload|force-reload|restart) - echo "Error: argument '$1' not supported" >&2 - echo "Usage: $SCRIPTNAME {start|stop}" >&2 - exit 3 - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop}" >&2 - exit 3 - ;; -esac diff --git a/debian/ceph-kdump-copy.install b/debian/ceph-kdump-copy.install deleted file mode 100644 index 1b77eec02b2..00000000000 --- a/debian/ceph-kdump-copy.install +++ /dev/null @@ -1 +0,0 @@ -usr/bin/ceph-kdump-copy diff --git a/debian/ceph.dirs b/debian/ceph.dirs index a35b85c5e1c..fcb92587308 100644 --- a/debian/ceph.dirs +++ b/debian/ceph.dirs @@ -1,3 +1,6 @@ etc/ceph var/log/ceph var/lib/ceph/tmp +var/lib/ceph/mon +var/lib/ceph/osd +var/lib/ceph/mds diff --git a/debian/ceph.install b/debian/ceph.install index bdcf2497eaf..51fb31104ab 100644 --- a/debian/ceph.install +++ b/debian/ceph.install @@ -7,6 +7,8 @@ usr/bin/ceph-mon usr/bin/ceph-mds usr/bin/ceph-osd usr/bin/ceph-debugpack +sbin/ceph-disk-prepare usr/sbin/ +sbin/ceph-disk-activate usr/sbin/ sbin/mkcephfs usr/lib/ceph/ceph_common.sh usr/lib/rados-classes/* diff --git a/debian/control b/debian/control index b482caa8745..c5ed2efba37 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,17 @@ Source: ceph Section: admin Priority: optional -Homepage: http://ceph.newdream.net/ +Homepage: http://ceph.com/ Vcs-Git: git://github.com/ceph/ceph.git Vcs-Browser: https://github.com/ceph/ceph Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.hu> Uploaders: Sage Weil <sage@newdream.net> -Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, libfuse-dev, libboost-dev (>= 1.34), libedit-dev, libcrypto++-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, libgoogle-perftools-dev [i386 amd64], pkg-config, libgtkmm-2.4-dev, python, libcurl4-gnutls-dev, libkeyutils-dev, uuid-dev, libaio-dev, python (>= 2.6.6-3~), libxml2-dev +Build-Depends: debhelper (>= 6.0.7~), autotools-dev, autoconf, automake, libfuse-dev, libboost-dev (>= 1.34), libedit-dev, libcrypto++-dev, libtool, libexpat1-dev, libfcgi-dev, libatomic-ops-dev, libgoogle-perftools-dev [i386 amd64], pkg-config, libcurl4-gnutls-dev, libkeyutils-dev, uuid-dev, libaio-dev, python (>= 2.6.6-3~), libxml2-dev Standards-Version: 3.9.3 Package: ceph -Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends}, sdparm | hdparm, binutils, ceph-common, uuid-runtime +Architecture: amd64 armel armhf i386 ia64 mipsel +Depends: ${shlibs:Depends}, ${misc:Depends}, sdparm | hdparm, binutils, ceph-common, uuid-runtime, python Recommends: ceph-fuse, libcephfs1, librados2, librbd1, btrfs-tools Description: distributed storage and file system Ceph is a distributed storage and network file system designed to provide @@ -21,7 +21,7 @@ Description: distributed storage and file system running, and administering a Ceph storage cluster. Package: ceph-dbg -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: debug Priority: extra Depends: ceph (= ${binary:Version}), ${misc:Depends} @@ -31,32 +31,8 @@ Description: debugging symbols for ceph . This package contains the debugging symbols for ceph. -Package: gceph -Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: -Suggests: ceph -Description: Graphical ceph cluster status utility - Ceph is a distributed network file system designed to provide - excellent performance, reliability, and scalability. This is a - gtk-based gui to monitor cluster status, similar to the 'ceph' - command. - -Package: gceph-dbg -Architecture: linux-any -Section: debug -Priority: extra -Depends: gceph (= ${binary:Version}), ${misc:Depends} -Description: debugging symbols for gceph - Ceph is a distributed network file system designed to provide - excellent performance, reliability, and scalability. This is a - gtk-based gui to monitor cluster status, similar to the 'ceph' - command. - . - This package contains the debugging symbols for gceph. - Package: ceph-fuse -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: fuse-utils Suggests: ceph @@ -73,7 +49,7 @@ Description: FUSE-based client for the Ceph distributed file system do. Package: ceph-fuse-dbg -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: debug Priority: extra Depends: ceph-fuse (= ${binary:Version}), ${misc:Depends} @@ -86,7 +62,7 @@ Description: debugging symbols for ceph-fuse This package contains the debugging symbols for ceph-fuse. Package: ceph-common -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Depends: ${shlibs:Depends}, ${misc:Depends}, librbd1 (= ${binary:Version}) Conflicts: ceph-client-tools Replaces: ceph-client-tools @@ -98,7 +74,7 @@ Description: common utilities to mount and interact with a ceph filesystem ceph fs with the kernel client. Package: ceph-common-dbg -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Depends: ceph-common (= ${binary:Version}), ${misc:Depends} Conflicts: ceph-client-tools-dbg Replaces: ceph-client-tools-dbg @@ -113,7 +89,7 @@ Description: debugging symbols for ceph-common This package contains the debugging symbols for ceph-common. Package: ceph-resource-agents -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Recommends: pacemaker Priority: extra Depends: ceph (= ${binary:Version}), ${misc:Depends}, resource-agents @@ -128,7 +104,7 @@ Description: OCF-compliant resource agents for Ceph Package: librados2 Conflicts: librados, librados1 Replaces: librados, librados1 -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: RADOS distributed object store client library @@ -140,7 +116,7 @@ Description: RADOS distributed object store client library Package: librados2-dbg Conflicts: librados1-dbg Replaces: librados1-dbg -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: debug Priority: extra Depends: librados2 (= ${binary:Version}), ${misc:Depends} @@ -153,7 +129,7 @@ Description: debugging symbols for librados This package contains debugging symbols for librados. Package: librados-dev -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: libdevel Depends: ${misc:Depends}, librados2 (= ${binary:Version}) Conflicts: librados1-dev, librados2-dev @@ -168,7 +144,7 @@ Description: RADOS distributed object store client library (development files) link against librados. Package: librbd1 -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: libs Depends: ${shlibs:Depends}, ${misc:Depends}, librados2 (= ${binary:Version}) Description: RADOS block device client library @@ -178,7 +154,7 @@ Description: RADOS block device client library shared library allowing applications to manage these block devices. Package: librbd1-dbg -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: debug Priority: extra Depends: librbd1 (= ${binary:Version}), ${misc:Depends} @@ -191,7 +167,7 @@ Description: debugging symbols for librbd1 This package contains debugging symbols for librbd1. Package: librbd-dev -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: libdevel Depends: ${misc:Depends}, librbd1 (= ${binary:Version}), librados-dev Conflicts: librbd1-dev @@ -208,7 +184,7 @@ Description: RADOS block device client library (development files) Package: libcephfs1 Conflicts: libcephfs, libceph, libceph1 Replaces: libcephfs, libceph, libceph1 -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Description: Ceph distributed file system client library @@ -218,7 +194,7 @@ Description: Ceph distributed file system client library file system via a POSIX-like interface. Package: libcephfs1-dbg -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: debug Priority: extra Depends: libcephfs1 (= ${binary:Version}), ${misc:Depends} @@ -233,7 +209,7 @@ Description: debugging symbols for libcephfs1 This package contains debugging symbols for libcephfs1. Package: libcephfs-dev -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: libdevel Depends: ${misc:Depends}, libcephfs1 (= ${binary:Version}) Conflicts: libcephfs1-dev, libceph1-dev, libceph-dev @@ -248,7 +224,7 @@ Description: Ceph distributed file system client library (development files) link against libcephfs. Package: radosgw -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-common Description: REST gateway for RADOS distributed object store RADOS is a distributed object store used by the Ceph distributed @@ -259,7 +235,7 @@ Description: REST gateway for RADOS distributed object store This package contains the proxy daemon and related tools only. Package: radosgw-dbg -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: debug Priority: extra Depends: radosgw (= ${binary:Version}), ${misc:Depends} @@ -272,13 +248,13 @@ Description: debugging symbols for radosgw This package contains debugging symbols for radosgw. Package: rest-bench -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-common, xml2, curl Description: RESTful bencher that can be used to benchmark radosgw performance. Package: rest-bench-dbg -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: debug Priority: extra Depends: ${shlibs:Depends}, ${misc:Depends}, ceph-common, xml2, curl @@ -286,7 +262,7 @@ Description: RESTful bencher that can be used to benchmark radosgw performance. Package: obsync -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Depends: ${misc:Depends}, python, python-boto, python-ceph, python-pyxattr, python-lxml Description: synchronize data between cloud object storage providers or a local directory obsync is a tool to synchronize objects between cloud object @@ -294,9 +270,9 @@ Description: synchronize data between cloud object storage providers or a local Ceph RADOS cluster, or a local directory. Package: python-ceph -Architecture: linux-any +Architecture: amd64 armel armhf i386 ia64 mipsel Section: python -Depends: ${python:Depends}, librados2, librbd1 +Depends: ${misc:Depends}, ${python:Depends}, librados2, librbd1 Description: Python libraries for the Ceph distributed filesystem Ceph is a distributed storage and network file system designed to provide excellent performance, reliability, and scalability. @@ -304,16 +280,3 @@ Description: Python libraries for the Ceph distributed filesystem This package contains Python libraries for interacting with Ceph's RADOS object storage, and RBD (RADOS block device). -Package: ceph-kdump-copy -Architecture: linux-any -Section: devel -Priority: extra -Depends: ${misc:Depends}, linux-crashdump -Description: Shell script to repackage linux crashdump files generated by - Ubuntu apport, then copy them to a remote system to facilitate - offline analysis. Also includes an init script and associated - configuration file to allow this to happen automatically at boot - time. - . - This package contains an init script and supporting shell script to - copy crashdump files to a remote server. diff --git a/debian/gceph.install b/debian/gceph.install deleted file mode 100644 index 143f83701ed..00000000000 --- a/debian/gceph.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin/gceph -usr/share/ceph_tool/gui_resources/* diff --git a/debian/radosgw.dirs b/debian/radosgw.dirs index 0714d9ba7ba..effc2504987 100644 --- a/debian/radosgw.dirs +++ b/debian/radosgw.dirs @@ -1 +1,2 @@ var/log/ceph +var/lib/ceph/radosgw diff --git a/debian/rules b/debian/rules index 84f3daa2789..941f3093a7a 100755 --- a/debian/rules +++ b/debian/rules @@ -45,6 +45,9 @@ endif configure: configure-stamp configure-stamp: dh_testdir + ./autogen.sh + ./configure --prefix=/usr --sbindir=/sbin --localstatedir=/var \ + --sysconfdir=/etc $(extraopts) $(confflags) touch $@ build-arch: build @@ -54,9 +57,6 @@ build: build-stamp build-stamp: configure-stamp dh_testdir - ./autogen.sh - ./configure --prefix=/usr --sbindir=/sbin --localstatedir=/var \ - --sysconfdir=/etc $(extraopts) $(confflags) $(MAKE) cp src/init-ceph debian/ceph.init @@ -104,6 +104,12 @@ binary-arch: build install dh_install --sourcedir=$(DESTDIR) --list-missing dh_installlogrotate dh_installinit --no-start + # dh_installinit is only set up to handle one upstart script + # per package, so do this ourselves + install -d -m0755 debian/ceph/etc/init + install -m0644 src/upstart/ceph*.conf debian/ceph/etc/init + install -d -m0755 debian/radosgw/etc/init + install -m0644 src/upstart/radosgw*.conf debian/radosgw/etc/init dh_installman dh_lintian dh_link @@ -115,7 +121,6 @@ binary-arch: build install dh_strip -plibrbd1 --dbg-package=librbd1-dbg dh_strip -plibcephfs1 --dbg-package=libcephfs1-dbg dh_strip -pradosgw --dbg-package=radosgw-dbg - dh_strip -pgceph --dbg-package=gceph-dbg dh_strip -prest-bench --dbg-package=rest-bench-dbg dh_compress |