Commit Graph

322 Commits

Author SHA1 Message Date
Loic Dachary
5ff4a850a0 rpm: 95-ceph-osd-alt.rules is not needed for centos7 / rhel7
The || instead of && had it always installed. That was fixed in EPEL
already.

http://tracker.ceph.com/issues/9747 Fixes: #9747

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-10-11 18:20:36 +02:00
Sage Weil
1036e9827c Merge remote-tracking branch 'gh/giant'
Conflicts:
	src/osdc/Objecter.cc
2014-10-07 12:40:45 -07:00
Sage Weil
6b9e20ac8d ceph.spec: make ceph -> python-ceph dependency specify version
It does this indirectly via ceph -> ceph-common -> python-ceph, but do so
here too for clarity/consistency.

Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-06 09:15:29 -07:00
Sage Weil
38dde3d3e2 Merge remote-tracking branch 'gh/giant' 2014-10-03 17:56:31 -07:00
Sage Weil
da9ae5c92e ceph.spec: fix typo
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-01 12:33:38 -07:00
Sage Weil
8388836208 ceph.spec.: add epoch
This is done in fedora packaging.  Do it here too so that you can move
between upstream packages (from ceph.com) and fedora and other derivatives
will builds.

Backport: firefly, dumpling
Signed-off-by: Sage Weil <sage@redhat.com>
2014-10-01 06:02:02 -07:00
Sage Weil
8cda623e0b ceph.spec.in: move ceph_rest_api.py into ceph
Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-29 14:24:01 -07:00
Sage Weil
b2416240b8 ceph.spec: fix python-flask dependency
This is needed by ceph-rest-api, which is in ceph.rpm; it's not related to
python-ceph (except that ceph-rest-api happens to require that too).

Backport: firefly
Signed-off-by: Sage Weil <sage@redhat.com>
2014-09-29 13:44:03 -07:00
Adam Crume
675a6a6704 rbd-replay: Add rbd-replay-many
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-09-11 16:48:03 -07:00
Loic Dachary
e9b09e8cc1 packaging: add all erasure code plugins to RPM packages
It means distributing a few plugins that are only used for unit testing
but it does not use much disk space and this is otherwise harmless.

Explicitly listing which plugins are to be installed is problematic
because some of them (isa for now and maybe more later) are not
available for all architectures. Properly maintaining the list of
plugins to install would therefore mean exactly matching which
architecture has which plugins.

http://tracker.ceph.com/issues/9381 Fixes: #9381

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
2014-09-09 17:05:56 +02:00
Samuel Just
038992b1da Merge pull request #2332 from ceph/wip-8231-forreview
Wip 8231 forreview

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-08-28 16:37:37 -07:00
David Zafman
83fbc91e5c Complete replacement of ceph_filestore_tool and ceph_filestore_dump
with unified ceph_objectstore_tool

Move list-lost-objects and fix-lost-objects features from
  ceph_filestore_tool to ceph_objectstore_tool as list-lost, fix-lost
Change --type to --op for info, log, export...operations
Add --type for the ObjectStore type (defaults to filestore)
Change --filestore-path to --data-path
Update installation, Makefile.am, and .gitignore
Fix and rename test case to match
  Add some additional invalid option checks

Signed-off-by: David Zafman <david.zafman@inktank.com>
2014-08-28 16:22:15 -07:00
Dan Mick
7474f720c2 ceph.spec.in: tests for rhel or centos need to not include _version
rhel_version and centos_version are apparently the OpenSUSE Build
names; the native macros are just "rhel" and "centos" (and contain
a version number, should it be necessary).

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2014-08-27 12:56:08 -07:00
Dan Mick
e37b262c79 ceph.spec.in: Add a small comment on the empty %files section
as suggested by Dan Mick.

Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
2014-08-27 12:56:08 -07:00
Dan Mick
875a99e25f ceph.spec.in: Obsolete all older versions.
Now this changeset can be used on all current ceph releases that already
have the package split.

Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
2014-08-27 12:56:08 -07:00
Dan Mick
8f95daf66b ceph.spec.in: No version on ceph-libs Obsoletes.
If we are installing with the new package structure we don't ever want the
new package to co-exist with the old one; this includes the mistakenly-
released v0.81 on Fedora, which should be removed in favor of this
version.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2014-08-27 12:56:07 -07:00
Sandon Van Ness
75985024bd ceph.spec.in: Obselete ceph-libcephfs (not libcephfs)
I am guessing that because it was a sub-package libcephfs was mistakenly
used instead of ceph-libcephfs.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2014-08-27 12:56:07 -07:00
Erik Logtenberg
00877ae502 ceph.spec.in: We need those nice recent changes for rhel7 in Fedora too.
Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
2014-08-27 12:56:07 -07:00
Erik Logtenberg
461523b06c ceph.spec.in, init-ceph.in: Don't autostart ceph service on Fedora.
This patch is taken from the current Fedora package and makes the upstream
ceph.spec compliant with Fedora policy. The goal is to be fully compliant
upstream so that we can replace current Fedora package with upstream
package to fix many bugs in Fedora.

Addition from Dan Mick <dan.mick@inktank.com>:
Do this for RHEL and Centos as well, since they surely will benefit
from the same policy.   Note: this requires changes to
autobuild-ceph and ceph-build scripts, which currently copy
only the dist tarball to the rpmbuild/SOURCES dir.

Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
Signed-off-by: Dan Mick <dan.mick@inktank.com>:
2014-08-27 12:56:07 -07:00
Erik Logtenberg
e9da2d8f21 ceph.spec.in: Add obsoletes for libcephfs
This fixes a bug for Fedora:
https://bugzilla.redhat.com/show_bug.cgi?id=1116614

Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
2014-08-27 12:56:07 -07:00
Erik Logtenberg
6c264f2204 ceph.spec.in: add ceph-libs-compat
Added a ceph-libs-compat package in accordance with Fedora packaging
guidelines [1], to handle the recent package split more gracefully.
In Fedora this is necessary because there are already other packages
depending on ceph-libs, that need to be adjusted to depend on the new
split packages instead. In the mean time, ceph-libs-compat prevents
breakage.

[1] http://fedoraproject.org/wiki/Upgrade_paths_%E2%80%94_renaming_or_splitting_packages

Signed-off-by: Erik Logtenberg <erik@logtenberg.eu>
2014-08-27 12:56:07 -07:00
Adam Crume
230c5b8e7f lttng: Only install rbd-replay-prep when enabled
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
861e6a3920 lttng: Update packaging
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
7ff6ed11b5 lttng: Only require lttng for Fedora >= 20 and RHEL == 6 for RPM distros
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:34 -07:00
Adam Crume
fed22f496e lttng: Add distro packaging
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Adam Crume
0cd2651cad rbd-replay: Add man page and package binaries for rbd-replay-prep
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Adam Crume
e18748ed99 rbd-replay: Add man page, and add binaries to Debian packaging
Signed-off-by: Adam Crume <adamcrume@gmail.com>
2014-08-21 10:57:33 -07:00
Sage Weil
213e0acf7e debian, rpm: build rocksdb statically if we can
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-31 21:11:25 -07:00
Sage Weil
a497a3b42e debian, rpm: build require bzip2 dev
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-31 21:11:24 -07:00
Sandon Van Ness
1526546ddc Remove reference from mkcephfs.
A bit of colission from spec changes for the rhel7/ceph-common
changes and alfredo's pull request for wip-die-ceph-mkcephfs.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2014-07-28 10:38:41 -07:00
Sage Weil
cb20b99641 Merge pull request #2154 from simon3z/master
init: add systemd service files

Reviewed-by: Alfredo Deza <alfredo.deza@inktank.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2014-07-28 09:22:47 -07:00
Dan Mick
c0cb56f6c8 ceph.spec.in: add bash completion file for radosgw-admin
Signed-off-by: Sandon Van Ness <sandon@inktank.com>
(cherry picked from commit b700963071)
2014-07-23 13:32:00 -07:00
Dan Mick
1ad4cd386e ceph.spec.in: rhel7-related changes:
udev rules: /lib -> /usr/lib
/sbin binaries move to /usr/sbin or %{_sbindir}

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
(cherry picked from commit 235e4c7de8)
2014-07-23 13:31:53 -07:00
Dan Mick
c57811fc4b Fix/add missing dependencies:
- rbd-fuse depends on librados2/librbd1
- ceph-devel depends on specific releases of libs and libcephfs_jni1
- librbd1 depends on librados2
- python-ceph does not depend on libcephfs1

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
(cherry picked from commit 7cf8132239)
2014-07-23 13:31:47 -07:00
Dan Mick
793e05a27a ceph.spec.in: whitespace fixes
Signed-off-by: Sandon Van Ness <sandon@inktank.com>
(cherry picked from commit ec8af52a5e)
2014-07-23 13:31:39 -07:00
Dan Mick
dae6ecbc31 ceph.spec.in: split out ceph-common as in Debian
Move files, postun scriptlet, and add dependencies on ceph-common
where appropriate

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
(cherry picked from commit e131b9d5a5)
2014-07-23 13:31:22 -07:00
Federico Simoncelli
c26477448e init: add systemd service files
This patch adds systemd service files. It is possible to start and
enable multiple instances (per monid, osdid, mds name), e.g.

 # systemctl start ceph-mon@node01
 # systemctl enable ceph-mon@node01

 # systemctl start ceph-osd@0
 # systemctl enable ceph-osd@0

The ceph cluster can be set in the system config file:

 /etc/sysconfig/ceph

adding or editing the CLUSTER environment variable.

Signed-off-by: Federico Simoncelli <fsimonce@redhat.com>
2014-07-22 11:30:55 -04:00
Sage Weil
58cc894b32 Revert "ceph.spec: move ceph-dencoder to ceph from ceph-common"
This reverts commit 95f5a448b5.
2014-07-18 20:55:39 -07:00
Alfredo Deza
0f11aaeefd remove suse service restarts
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
2014-07-17 15:06:10 -04:00
Alfredo Deza
e3a5756f58 remove ceph restarts on upgrades for RPMs
Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
2014-07-17 15:03:19 -04:00
Sage Weil
95f5a448b5 ceph.spec: move ceph-dencoder to ceph from ceph-common
Signed-off-by: Sage Weil <sage@redhat.com>
2014-07-14 17:02:05 -07:00
Dan Mick
b700963071 ceph.spec.in: add bash completion file for radosgw-admin
Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2014-07-07 13:12:41 -07:00
Dan Mick
235e4c7de8 ceph.spec.in: rhel7-related changes:
udev rules: /lib -> /usr/lib
/sbin binaries move to /usr/sbin or %{_sbindir}

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2014-07-07 13:12:41 -07:00
Dan Mick
7cf8132239 Fix/add missing dependencies:
- rbd-fuse depends on librados2/librbd1
- ceph-devel depends on specific releases of libs and libcephfs_jni1
- librbd1 depends on librados2
- python-ceph does not depend on libcephfs1

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2014-07-07 13:12:23 -07:00
Dan Mick
ec8af52a5e ceph.spec.in: whitespace fixes
Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2014-07-07 13:11:14 -07:00
Dan Mick
e131b9d5a5 ceph.spec.in: split out ceph-common as in Debian
Move files, postun scriptlet, and add dependencies on ceph-common
where appropriate

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
2014-07-07 13:09:50 -07:00
Sebastien Ponce
910d73c4a8 Added RPM and debian packaging for libradosstriper, creating a new package called libradosstriper1
Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
2014-06-06 18:12:34 -07:00
Sebastien Ponce
8c124910a8 Fixed usage of rhel_version in spec file : it should have been rhel
Signed-off-by: Sebastien Ponce <sebastien.ponce@cern.ch>
2014-06-05 10:07:16 -07:00
John Spray
78313b7d5d Merge pull request #1739 from ceph/wip-journal-tool
cephfs-journal-tool
2014-05-27 14:51:18 +01:00
Sage Weil
401319a152 ceph.spec.in: remove BuildRoot
Deprecated

Fixes: #8143
Signed-off-by: Sage Weil <sage@inktank.com>
2014-05-20 13:41:35 -07:00