Commit Graph

472 Commits

Author SHA1 Message Date
Sage Weil
838f1cde94 preserve /var/lib/ceph on deb/rpm purge
We should clobber configuration and log data, but *not* user data.  Leave
/var/lib/ceph alone.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
2013-03-22 15:24:51 -07:00
Gary Lowell
d67eee1d11 Merge branch 'next' 2013-03-21 00:40:16 -07:00
Gary Lowell
cbae6a435c v0.59 2013-03-19 22:27:13 -07:00
David Zafman
6a3aa2a2cc Missed adding rados_types.hpp to package
Caused by 3bd48cbbad
feature 4207 implementation

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
(cherry picked from commit e1e2d5d217)
2013-03-19 13:02:00 -07:00
Sage Weil
632f7200bb Merge branch 'next'
Conflicts:
	src/mon/AuthMonitor.cc
2013-03-14 21:11:35 -07:00
Gary Lowell
6f15dba931 debian/control: Fix for moved file
The ceph-mds.conf file moced from the ceph package to the
ceph-mds package.  Add replaces/breaks statements to the
control file to handle this on upgrade.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-03-14 17:16:24 -07:00
Sage Weil
efd153e9e2 debian: add start ceph-mds-all on ceph-mds install
This ensures that when we then start individual mds instances, we can
stop ceph-mds-all and they will get stopped.  We do the same already for
ceph-all.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit 41897fcba1)
2013-03-14 12:33:57 -07:00
Sage Weil
41897fcba1 debian: add start ceph-mds-all on ceph-mds install
This ensures that when we then start individual mds instances, we can
stop ceph-mds-all and they will get stopped.  We do the same already for
ceph-all.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-14 12:33:08 -07:00
Gary Lowell
a5156fb74c Merge pull request #97 from Elbandi/master
Fix FTBFS

Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
2013-03-12 11:15:00 -07:00
Josh Durgin
82677c38b7 Merge branch 'next' 2013-03-11 16:59:05 -07:00
Sage Weil
9eb0d91b86 debian: stop ceph-mds before uninstalling ceph-mds
Fixes: #4384
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-11 17:09:37 -07:00
Andras Elso
0dd956cb02 debian: Fix FTBFS because depend on old libboost-dev
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-03-10 01:18:16 +01:00
David Zafman
e1e2d5d217 Missed adding rados_types.hpp to package
Caused by 3bd48cbbad
feature 4207 implementation

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
2013-03-06 14:40:29 -08:00
Alan Grosskurth
a319f5cb74 debian: require libsnappy-dev for ceph
Debian builds are currently broken without this requirement.
2013-03-06 02:21:12 -08:00
Gary Lowell
af6b6eddae Merge branch 'master' of https://github.com/ceph/ceph 2013-03-05 09:06:24 -08:00
Gary Lowell
66cadbe515 Merge branch 'next' 2013-03-05 09:05:21 -08:00
Josh Durgin
867586c674 debian: require >= python2.6 for ceph as well
ceph-disk-prepare and ceph-disk-activate use the with statement,
str.format, and possibly other new features from python 2.6.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-03-04 16:49:14 -08:00
Gary Lowell
ba3f91e750 v0.58 2013-03-04 15:18:24 -08:00
Filippos Giannakos
66df847e00 Add X-Python-Version >=2.6 to debian control file.
python-ceph complains when installed to debian squeeze about the 'with'
statement. Apparently installation tries to install the python-ceph package for
python 2.5, which does not support the 'with' statement natively.

Signed-off-by: Filippos Giannakos <philipgian@grnet.gr>
2013-03-04 15:10:00 -08:00
Gary Lowell
b65ca564b6 ceph-test.install: Add libcephfs-test.jar to package.
Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-27 18:25:09 -08:00
Sage Weil
cfcaceac44 debian: require cryptsetup-bin
This is needed for ceph-disk-prepare's dmcrypt support.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-27 15:43:57 -08:00
Sage Weil
d9d075e976 debian: let dpkg calculate the shlibs dep for leveldb (if any)
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-27 09:45:02 -08:00
Danny Al-Gaaf
f42a63ba1b debian/control: fix Depends
Remove request for libleveldb1 version > 1.2. Every libleveldb1 package
should work, otherwise the SO name/version of the library should change.

Fixes: #3945

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 15:39:18 +01:00
Danny Al-Gaaf
43161532d6 debian/control: add libleveldb-dev to Build-Depends:
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 14:47:49 +01:00
Gary Lowell
ea546aef0c Build: Change build to always use system leveldb
Dynamically link to the leveldb installed on the system rather than
statically linking ceph copy.  Remove the --with-system-leveldb config
option, and add a requirement for leveldb libraries for rpm and debian
packages.  Bug 3945.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-26 20:07:49 -08:00
Gary Lowell
a34e7c6f6b ceph-test.install: remove cepkfs-test.jar
This was merged prematurely to mast.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-26 18:28:34 -08:00
Gary Lowell
0666b630b7 ceph-test.install: Add libcephfs-test.jar.
Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-26 17:29:46 -08:00
Danny Al-Gaaf
cf167a1f30 debian: add new files
Add new (installed) files to debian install files.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-25 15:36:37 +01:00
Sage Weil
9217c4ac68 debian: make gdisk, parted requirements, not recommendations.
ceph-prepare-disk (and thus ceph-deploy) need this.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-24 13:31:06 -08:00
Gary Lowell
bcb210c677 Merge branch 'next' 2013-02-19 14:53:54 -08:00
Gary Lowell
9a7a9d06c0 v0.57 2013-02-19 10:07:42 -08:00
Sage Weil
8e0be54857 debian: allow extra args to get passed to ./configure via the environment
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-18 17:07:55 -08:00
Sage Weil
aff0bb6fdc debian: fix start of ceph-all
Tolerate failure, and do ceph-all, not ceph-osd-all.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-16 16:49:50 -08:00
Sage Weil
b7b9af5c0d debian: start/stop ceph-all event on install/uninstall
This helps us avoid the confusing situation with upstart where an individual
daemon job is running (like ceph-osd id=2) but the container jobs ceph-osd-all
and ceph-all are not.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-13 23:11:07 -08:00
Sage Weil
5bd85ee5aa udev: trigger ceph-disk-activate directly from udev
There is no need to depend on upstart for this.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-13 22:18:59 -08:00
Sage Weil
23ad3a46a0 debian: put ceph-mds upstart conf in ceph-mds package
Fixes: #3157
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-13 12:30:22 -08:00
Sage Weil
e80675a0f3 debian: include /var/lib/ceph/bootstrap-mds in package
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-13 12:30:22 -08:00
Sage Weil
50cbd10531 debian: implement purge postrm script for ceph, ceph-mds
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-13 12:30:22 -08:00
Sam Lang
376cca2d4d deb: Add ceph-coverage to ceph-test deb package
Teuthology uses the ceph-coverage script extensively
and expects it to be installed by the ceph task.  Add
the script to the ceph-test debian package so that it
gets installed for that use case.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-02-12 17:12:35 -06:00
Danny Al-Gaaf
125cb7190d ceph-test.install: updated filelist
Add some files which are part of the ceph-test package on RPM based
distributions already: ceph_test_mon_workloadgen, ceph_rgw_jsonparser,
ceph_test_objectcacher_stress.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-10 19:00:40 +01:00
Danny Al-Gaaf
6cecdd86f7 spec/debian: don't install rest-bench twice
Don't install rest-bench in ceph.spec.in section for ceph-test and
ceph-test.install twice. This file is already part of the rest-bench
package.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-10 18:56:47 +01:00
Danny Al-Gaaf
7b89ee666b ceph-test: give binaries from ceph-test package useful names
The files from the ceph-test subpackage are installed to /usr/bin,
give them more useful names to make sure that the user know they
belong to ceph. add a 'ceph_' prefix and change some test* binaries
to ceph_test_*.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-10 18:33:56 +01:00
Yehuda Sadeh
c8eace6ff0 rgw: create a separate logrotate file for radosgw
Fixes: #3813
Since radosgw package is separate from the ceph package,
it also needs to have a separate logrotate. The default
path for radosgw log is changed to /var/log/radosgw,
and it now has a different logrotate script.
Updating both deb and rpm packaging.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-02-05 14:54:38 -08:00
Gary Lowell
4a6924a562 install: remove perl dependency
Change the filter in logrotate to use sed instead of perl, and remove the
package dependency on perl.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-04 12:56:01 -08:00
Sage Weil
4be48a6e53 Merge remote-tracking branch 'gh/wip-rbd-bench'
Conflicts:
	ceph.spec.in
	debian/ceph-test.install
	src/.gitignore
2013-02-03 08:59:48 -08:00
Gary Lowell
16cf9dc67e build: Add new rbd-fuse package
rdb-fuse is a new facility to map ceph rdb images to files.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-01-31 20:35:26 -08:00
David Zafman
0758fabaed Add ceph-filestore-dump to the packaging
Feature: #3890

Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-01-30 22:50:41 -08:00
Josh Durgin
0d172b95de packaging: add smalliobenchrbd
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-01-22 16:19:27 -08:00
Gary Lowell
bebdc70b42 build: Add perl installation dependency to rpm and debian packages.
There was already a dependency on python in the debian control file,
a similar dependency was added to the rpm spec file.  perl is needed
for the logrotate script, so a dependecy was on perl wass added to
both. Bug 3768.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-01-17 22:43:07 -08:00
Gary Lowell
1a32f0a0b4 v0.56 2012-12-31 17:10:11 -08:00