Commit Graph

540 Commits

Author SHA1 Message Date
Sage Weil
9797986697 Merge remote-tracking branch 'gh/next' 2013-08-02 11:54:53 -07:00
Gary Lowell
16adb916cd v0.67-rc3 2013-07-30 14:37:56 -07:00
Sage Weil
e747fa8e32 Revert "Use dh_installinit to install upstart job files"
This reverts commit 251a6a498d.

This includes /etc/init.d/radosgw in the ceph package, which makes it
conflict with radosgw.
2013-07-30 13:31:35 -07:00
Sage Weil
3f5352ac67 Merge pull request #463 from toabctl/upstart-handling
Use dh_installinit to install upstart job files

Reviewed-by: Gaudenz Steinlin <gaudenz@debian.org>
2013-07-29 15:09:19 -07:00
Thomas Bechtold
251a6a498d Use dh_installinit to install upstart job files
Signed-off-by: Thomas Bechtold <thomasbechtold@jpberlin.de>
2013-07-29 14:53:58 +02:00
Sage Weil
ee18322e5b Merge remote-tracking branch 'gh/next' 2013-07-28 16:17:55 -07:00
Sage Weil
dd3b0865e0 Merge pull request #464 from toabctl/fuse-utils-obsolete
Remove fuse-utils from Recommends in debian/control

Reviewed-by: Sage Weil <sage@inktank.com>
2013-07-27 17:34:12 -07:00
Sage Weil
6881ab3b39 debian, rpm: make python-ceph depend on python-requests
For ceph-rest-api.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-27 17:32:49 -07:00
Sage Weil
14a3e2ddce remove unused fiemap code
Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-26 16:58:14 -07:00
Sage Weil
a164f575c1 v0.67-rc2
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJR8GEaAAoJEH6/3V0X7TFtQWcP/2Y1Z+EIZf3a3olq+I60drXD
 lKla+SVNp9tr/i3AZD50HZCfLM/1H94CYdCrF5ZYoidue6KHXGazf/EEoRvwgRUv
 CsVnhHSAI+/4KyCUkYPrbgM7W2PxxdP5yCgZ13qMZAcPvPcqnZRD6pmi9efW11Gz
 C/a4lXDI9yXdcLBcKKcxCC3BCj14bea45Ic+4hMxgEnCBCp/2IDBLTr5RmcCsjIF
 8HtXF/v/8Vf5r4Vutxl93hYWuYSoWNh8vYbM0/zum+Z/5tULJXA/dozc2RtdYsC3
 N+8cND7rw9AmdO2WLaWQIJtshImp44+lkKnzSSBqwD6qhJBC+YBoNUGUPEGkPqG1
 LKn0LinKmbB2XM6uAQt6ccVjeR3bA3RF4T/G6OLjuJwICRRysBLtc0EeSp6NMKFq
 6+3YejwN8FTPhSbQ+K5Pl1VxMy3FT3As4x0bpXGK6qTGN00wmwGtvMFhjjxJpKQh
 3ZKeJiLLEEu5VN+Ro1NfLmCHmsxM8yTcExRBN17eG75v3Yt6bavjpwGIhZ52AeTu
 eTkah0FrVTsakkafuETSFYFw1M+pvoaAnAWnx1KFSg5JUx18nCDhfpEX1S6Ufgzt
 8Hf7xMMDI2gKtxRNYv2vqKPx409yBMG+0yA4StOiKeo7mQSTI/bnKa1FEk3PD4WR
 axO71RlwK8c+G9FnysNj
 =ZhZF
 -----END PGP SIGNATURE-----

Merge tag 'v0.67-rc2' into next

v0.67-rc2
2013-07-25 09:49:32 -07:00
Dan Mick
41930b5e8f ceph.spec.in, debian/control: python-ceph depends on python-flask
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-07-24 16:31:46 -07:00
Gary Lowell
0018b45f3c v0.67-rc2 2013-07-24 16:18:56 -07:00
Thomas Bechtold
c8d66b7a7d Remove fuse-utils from Recommends in debian/control
The package fuse-utils is obsolete and no longer in Debian unstable.
2013-07-24 07:00:58 +02:00
Gary Lowell
835dd97301 v0.67-rc1 2013-07-22 11:57:27 -07:00
Dan Mick
1f8fe709b6 ceph-rest-api: Missing packaging (binary in .spec, manpage in both)
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-07-11 18:25:44 -07:00
Dan Mick
4cb0e06266 Add 'ceph-rest-api'
ceph-rest-api is a Python WSGI module for accessing the Ceph cluster.
It supports most of the commands supported by the ceph CLI,
appropriately translated to HTTP GET/PUT requests.  It is not a
truly RESTful interface.

Not supported at this moment: "tell", "pg <pgid>", and "daemon"
commands.

Configuration options are specified in ceph.conf, specified with
-c/--conf or obtained from $CEPH_CONF, /etc/ceph/ceph.conf,
~/.ceph/ceph.conf, or ./ceph.conf.

-n/--name specifies the client name, used for the cluster
authentication key and for the ceph.conf section name (default
is client.restapi).

        restapi keyring = <keyring file>
        restapi public addr = listenIP:port (default 0.0.0.0:5000)
        restapi base url = <base path> (default /api/v0.1)
        restapi log level = (error, warning, info, debug)
        restapi log file = (default /var/log/ceph/<clientname>.log)

Primitive human-level command discovery is supported; GET from
BASEURL (say, http://localhost:5000/api/v0.1) will show an HTML
table of all commands and arguments, method supported, and help strings.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-07-10 20:58:51 -07:00
Danny Al-Gaaf
ff5f25eb24 debian/ceph-test.install: add missing files
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-07-10 17:55:52 +02:00
Gary Lowell
d4ca36b317 Merge branch 'next' 2013-07-08 23:17:50 -07:00
Gary Lowell
b6b48dbefa v0.66 2013-07-08 15:45:00 -07:00
Laurent Barbe
0efcccdcc2 Move rbdmap file to /etc/ceph
Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2013-07-02 16:53:11 +02:00
Laurent Barbe
ffe7045893 install rules for init-rbdmap
Signed-off-by: Laurent Barbe <laurent@ksperis.com>
2013-07-02 16:50:40 +02:00
Gary Lowell
70be76b2e2 Merge branch 'next' 2013-06-25 13:45:22 -07:00
Gary Lowell
c2d517ef96 v0.65 2013-06-25 09:19:32 -07:00
Sage Weil
046e3b71a1 debian, rpm: remove python-lockfile dependency
As for 2a4953b697 ceph-disk no longer uses
this.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-06-24 13:04:58 -07:00
Sage Weil
1aca370ed0 debian: ceph-common requires matching version of python-ceph
If they skew the ceph_argparse.py module may be missing.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-06-22 10:28:16 -07:00
Gary Lowell
3474fa8361 rules: Don't disable tcmalloc on ARM (and other non-intel)
Fixes #5342

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-06-14 15:11:05 -07:00
Gary Lowell
35ac835fc8 Merge branch 'next' 2013-06-12 15:00:05 -07:00
Gary Lowell
42e06c12db v0.64 2013-06-12 09:54:06 -07:00
Dan Mick
3ac6ffe802 Merge branch 'wip-ceph-cli' into master
Conflicts:
	src/include/rados/librados.h
	src/librados/librados.cc
	src/osdc/Objecter.cc
	src/pybind/rados.py

Required modifications to:
	src/osd/OSD.cc

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-06-06 20:08:15 -07:00
Josh Durgin
5a53da3c16 ceph-test: add ceph_test_rados_api_lock to packaging and qa
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-06-05 12:58:44 -07:00
Dan Mick
ee0913c2e6 Merge remote-tracking branch 'origin/master' into wip-ceph-cli
Conflicts:
	src/mon/OSDMonitor.cc
	src/osd/OSD.cc
	src/osd/ReplicatedPG.cc
2013-06-04 13:12:08 -07:00
Dan Mick
51a887a24c Add ceph_test_rados_api_cmd to the ceph-test package
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-06-03 21:07:17 -07:00
Sage Weil
44d1513880 Merge remote-tracking branch 'gh/next' 2013-06-02 14:48:04 -07:00
Sage Weil
cf9aa7a003 debian: guard upstart {start,stop} with -x check
Sigh.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-30 17:23:36 -07:00
Sage Weil
1d75b49c72 debian: add radosgw.postinst
Start radosgw-all job.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-30 16:22:54 -07:00
Sage Weil
d126a205ca debian: invoke-rc.d does not work with upstart jobs
Broken by 19c5ac37ef.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-30 16:22:40 -07:00
Sage Weil
59916b8efa debian: stop radosgw daemons on package removal
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-30 08:53:22 -07:00
Sage Weil
9e658f0321 debian: stop sysvinit ceph-mds daemons
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-30 08:53:05 -07:00
Sage Weil
70a383204b debian: only stop daemons on removea; not upgrade
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-30 08:51:16 -07:00
James Page
e634d9d6b6 Use new fuse package instead of fuse-utils
The fuse-utils package was deprecated a while ago.

Switch the primary dependency for fuse tools to use
the preferred 'fuse' package.

Signed-off-by: James Page <james.page@ubuntu.com>
2013-05-29 10:57:17 +01:00
Sage Weil
6afc22a158 Merge remote-tracking branch 'gh/last' 2013-05-28 22:10:21 -07:00
Gary Lowell
054e96cf79 v0.63 2013-05-28 13:58:22 -07:00
Dan Mick
70a96973e9 packaging fixes around the new ceph cli:
Remove ceph-legacy-cli
Include ceph in proper places to get it built/installed/packaged
Make ceph-common (deb) or ceph (rpm) pkg depend on python-ceph pkg

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-05-21 20:33:23 -07:00
Dan Mick
850a4cc4f1 Rename "ceph" tool to "ceph-legacy-cli"
Conflicts:
	src/Makefile.am

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-05-21 15:54:12 -07:00
Sage Weil
bbcbab448b Merge branch 'next'
Conflicts:
	debian/ceph.prerm
2013-05-21 08:26:57 -07:00
James Page
19c5ac37ef Use invoke-rc.d in maintainer scripts
Upstart configurations and sysv init scripts should be started and stopped
using invoke-rc.d in maintainer scripts.

This ensures the correct behaviour across both Debian (sysv) and Ubuntu (upstart)
and in restricted environments such as schroot where start/stop of services from
maintainer scripts is normally disabled.

Signed-off-by: James Page <james.page@ubuntu.com>
2013-05-21 09:22:39 +01:00
Sage Weil
2f193fb931 debian: stop sysvinit on ceph.prerm
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-20 14:39:16 -07:00
Sage Weil
d8d7113c35 udev: install disk/by-partuuid rules
Wheezy's udev (175-7.2) has broken rules for the /dev/disk/by-partuuid/
symlinks that ceph-disk relies on.  Install parallel rules that work.  On
new udev, this is harmless; old older udev, this will make life better.

Fixes: #4865
Backport: cuttlefish
Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-16 18:40:29 -07:00
Sage Weil
604c83ff18 debian: make radosgw require matching version of librados2
...indirectly via ceph-common.  We get bad behavior when they diverge, I
think because of libcommon.la being linked both statically and dynamically.

Fixes: #4997
Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
2013-05-16 13:17:45 -07:00
Gary Lowell
9382379cc6 v0.62 2013-05-14 09:13:07 -07:00