Commit Graph

189 Commits

Author SHA1 Message Date
Gary Lowell
e5b25bd36b Merge branch 'next' 2013-05-06 19:51:47 -07:00
Danny Al-Gaaf
eae02fd34c ceph.spec.in: remove twice listed ceph-coverage
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-06 11:30:18 -07:00
Danny Al-Gaaf
71cef0867b ceph.spec: add some files to ceph
Add installed, but not packaged files to ceph-test (ceph-monstore-tool,
ceph-osdomap-tool) rpm file section.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-06 11:30:02 -07:00
Danny Al-Gaaf
6f33885111 ceph.spec.in: remove twice listed ceph-coverage
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-06 15:21:56 +02:00
Danny Al-Gaaf
acb60e58e4 ceph.spec: add some files to ceph
Add installed, but not packaged files to ceph-test (ceph-monstore-tool,
ceph-osdomap-tool) rpm file section.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-05-06 15:09:32 +02:00
Sage Weil
b2501e91bb ceph.spec: require xfsprogs
This is needed when creating new OSDs (via ceph-disk).  At least for most
people.  Eventually we'll want to include btrfs here.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-05-03 13:28:24 -07:00
Sage Weil
3cc106453f Merge remote-tracking branch 'gh/next' 2013-04-26 18:12:24 -07:00
Gary Lowell
50e58b9f49 ceph.spec.in: remove conditional checks on tcmalloc
tcmalloc is available on all supported platforms now.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-04-26 16:05:25 -07:00
Sage Weil
14777ec1b5 Merge remote-tracking branch 'gh/next'
Conflicts:
	ceph.spec.in
2013-04-24 08:51:25 -07:00
Gary Lowell
7ad63d23d7 ceph-disk: OSD hotplug fixes for Centos
Two fixes for Centos 6.3 and other systems with udev versions
prior to 172.  The disk peristant name using the GPT UUID does
not exist, so use the by_path persistent name instead for the
journal symlink.

The gpt label fields are not available for use in udev rules. Add
ceph-disk-udev wrapper script that extracts the partition
type guid from the label and calls ceph-disk-activate if it is
a ceph guid type. (Bug #4632)

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-04-22 22:30:39 -07:00
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
69974a4dbd Merge branch 'wip-4725' Add build dependencies (Bug 4725) 2013-04-18 08:30:51 -07:00
Gary Lowell
86c1ea1156 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 08:24:37 -07:00
Danny Al-Gaaf
d801ca3077 ceph.spec.in: use %{_sbindir} macro again
Commit ae71b576a7 change some paths
again to absolute path to /usr/sbin. Use the correct macro %{_sbindir}
again as done in 4b90a958d1.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-15 12:47:27 +02: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 3bd48cbbadb7908dd833ccde75359f085828fc5c
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