Commit Graph

176 Commits

Author SHA1 Message Date
Gary Lowell
f4bc760776 build: Add new package dependencies
Add libboost-system-dev (bug #4725).

Add hdparm to rpm installation requirements.  The hdparm
command is used to determin if write-caching is enabled on
the journal device.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-04-18 10:41:20 -07:00
Gary Lowell
ae71b576a7 init-radosgw.sysv: New radosgw init file for rpm based systems
Added init-radosgw.sys file for rpm based systems, added it to
the tarball list in the makefile, and updated the specfile to
install it.  Also added the a dependency in ceph since it uses
utility routes from that package (On debian systems these are
packaged in ceph-common).  Incorporated review comments from
Alex. (Bug #4571)

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
Reviewed-by: Alexandre Marangone  <alexandre.marangone@inktank.com>
2013-04-11 23:02:08 -07:00
Danny Al-Gaaf
a3a658dc53 ceph.spec.in: add installed but not packaged files to ceph-test
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-04 18:30:40 +02:00
Danny Al-Gaaf
8cf3319f5d ceph.spec.in: remove some twice created directories
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-04 18:27:13 +02:00
Danny Al-Gaaf
6bc14889be ceph.spec.in: fix udev rules.d files handling
Move 50-rbd.rules into the ceph base package since the related
ceph-rbdnamer binary is part of this package. Use correct install
pattern.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-04 18:23:40 +02:00
Danny Al-Gaaf
4b90a958d1 ceph.spec.in: use macros for standard directories
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-04 18:21:31 +02:00
Danny Al-Gaaf
a8362f5c9a ceph.spec.in: reorder and fix ceph file list
Reorder file list of ceph package. Fix handling of placeholder
directories, make use of directories marcros like %{_localstatedir}
for /var.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-04 18:18:30 +02:00
Danny Al-Gaaf
61a2be3bb6 ceph.spec.in: don't move ceph-disk* and ceph-create-keys around
Don't move these files around, they get installed now directly to
%{_sbindir}.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-04 15:58:12 +02:00
Danny Al-Gaaf
354c41e71d ceph.spec.in: use %{_sbindir} instead of /usr/sbin
Use %{_sbindir} macro which points to /usr/sbin instead of
hard coded path.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-04 12:52:55 +02:00
Gary Lowell
b98251633b ceph.spec.in: Add python-argparse dependency
The python-argparse package is needed by ceph-create-keys script.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-03-28 17:14:33 -07:00
Gary Lowell
e950ed07c3 ceph.spec.in: Move four scripts from sbin to usr/bin
The ceph-create-keys, ceph-disk, ceph-disk-activate, and
ceph-disk-prepare scripts are built in sbin, but debian installs
them into usr/bin, and several utilities look for them there.
This commit changes the RPM to install them in /usr/bin. (Bug #3921)

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-03-28 16:12:33 -07:00
Sage Weil
84738791fe Merge branch 'next' 2013-03-23 11:03:58 -07:00
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
Sage Weil
c2602d7490 ceph-disk: install and package
Signed-off-by: Sage Weil <sage@inktank.com>
2013-03-19 12:52:23 -07:00
Sam Lang
acae3d02b9 pybind/cephfs: Add initial py wrappers for cephfs.
Initial Support for python bindings to libcephfs for testing
MDS backtraces with a the python script test-backtraces.py.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-03-16 11:45:36 -05:00
Gary Lowell
ee178fba49 ceph.spec.in: Additional clean-up on package removal
When removing the last instance of ceph, also remove the files
created by ceph during operation.  These consist of the files
under /var/lib/ceph, /etc/ceph, and /var/log/ceph. Bug #4415.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-03-15 16:25:39 -07: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
Gary Lowell
83705e6497 Merge pull request #85 from dalgaaf/wip-da-spec-1
Fix package requirements to get sgdisk and merge some changes back from SUSE spec file.

Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
2013-03-01 19:09:04 -08:00
Gary Lowell
ded94add32 ceph.spec.in: Require gptfdisk for Suse, gdisk for otherwise
Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-03-01 10:38:49 -08:00
Danny Al-Gaaf
eed147618a ceph.spec.in: merge fdupes support from SUSE packages
Use fdupes to avoid duplicated files as done in the SUSE
packages. Since it doesn't work as expected on Fedora/RHEL
do this only on SUSE based distros.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-01 12:02:44 +01:00
Danny Al-Gaaf
558681d9fd ceph.spec.in: add on non-RHEL sharutils to 'BuildRequires:'
Add sharutils to 'BuildRequires:', needed for configure.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-01 11:56:54 +01:00
Danny Al-Gaaf
db4fee2933 ceph.spec.in: fix 'Requires:' to get sgdisk into the system
Fix package Requirements to get sgdisk. On RHEL/CentOS/Fedora the
package is gdisk. On SUSE/openSUSE < 12.2 it's scsirastools on
openSUSE >= 12.2 it's in gptfdisk.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-03-01 11:51:26 +01:00
Gary Lowell
96e9da1f54 ceph.spec.in: gdisk for for rpm based systems instead of gptfdisk.
Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-28 22:31:47 -08:00
Danny Al-Gaaf
5c3f5c5b69 ceph.spec.in: add new Requires from ceph-disk-prepare
Added new Requires from ceph-disk-prepare: cryptsetup, gptfdisk,
parted and util-linux.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-28 14:16:26 +01:00
Danny Al-Gaaf
f811f72795 ceph.spec.in: fix leveldb handling
There is no need to add leveldb as 'Requires:'. The RPM build system
will find this dependency by itself.

Add leveldb-devel to BuildRequires: since this is what the package
really needs to build ceph correctly with libleveldb1.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 14:39:13 +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
1c8ffc5852 ceph.spec.in: Create placeholder directorys under /var/lib/ceph (Bug 4119)
Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-25 23:51:25 -08:00
Danny Al-Gaaf
4b77deb477 ceph.spec.in: add new files
Add new files to spec file since they get installed.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-25 15:34:17 +01:00
Sage Weil
37ef3f4b72 Merge remote-tracking branch 'gh/wip-deploy'
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
2013-02-16 09:39:34 -08:00
Danny Al-Gaaf
01f82b842b ceph.spec.in: remove librados2 requirement from librbd1
Remove librados2 requirement from librbd1. The RPM build system
will find the dependency by itself.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-14 15:27:00 +01:00
Danny Al-Gaaf
9952f2dd50 ceph.spec.in: cleanup requirements of fuse packages
Cleanup the Requires: list of the fuse packages. Remove fuse-libs,
libstdc++, libuuid. Don't add libraries to the list, the RPM build
system will find the dependencies by itself.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-14 15:11:18 +01: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
Sam Lang
7aefe92353 specfile: Add ceph-coverage to list of binaries
Signed-off-by: Sam Lang <sam.lang@inktank.com>
2013-02-13 09:53:55 -06: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
fd1512fc89 Build: Add -n to files and description for rbd-fuse in ceph.sepc.in
Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-01-31 21:51:44 -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
Danny Al-Gaaf
9235271a05 ceph.spec.in: fix file section for ceph-resource-agents
Create needed dirs (/usr/lib/ocf/resource.d/ceph) for the ceph-resource-agents
subpackage.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-01-31 14:16:03 -08:00
Danny Al-Gaaf
6e09cb9ba5 ceph.spec.in: extend fix for libedit-devel on special SUSE versions
Extend fix for libedit-devel on special SUSE versions, use ncurses
also on src/ocf/Makefile and src/java/Makefile

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-01-31 14:16:03 -08:00
Danny Al-Gaaf
4c1d8d088a ceph.spec.in: don't move libcephfs_jni files around
Don't move libcephfs_jni files around from %{_libdir} to /usr/lib/jni/
in the buildroot. They should be placed in %{_libdir} as all libs.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-01-31 14:16:03 -08:00
Danny Al-Gaaf
9b16036e3b ceph.spec.in: move libcephfs_jni.so to ceph-devel
Move libcephfs_jni.so to the ceph-devel package since so-files they
shouldn't be part of the library package.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-01-31 14:16:02 -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
Gary Lowell
0b66994c18 ceph.spec.in: package rbd udev rule
Package udev/50-rbd.rules per bug 3930.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-01-28 22:49:45 -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
Danny Al-Gaaf
d8c4fc5ebb ceph.spec.in: fix libcephfs-jni package name
Rename libcephfs-jni to libcephfs_jni1 to reflect the SO name/version of
the library and to prevent RPMLINT to complain about the naming.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-01-09 17:13:11 -08:00
Danny Al-Gaaf
f027d025a9 ceph.spec.in: rename libcephfs-java package to cephfs-java
Rename the libcephfs-java package to cephfs-java since the package
contains no (classic) library and RPMLINT complains about the name.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-01-09 17:13:11 -08:00