Commit Graph

578 Commits

Author SHA1 Message Date
branto1
8322a5c2a6 Merge pull request #6103 from SUSE/wip-re-redrop-fdupes
ceph.spec.in: re-re-drop fdupes

Reviewed-by: Boris Ranto <branto@redhat.com>
2015-09-29 12:57:32 +02:00
Nathan Cutler
e42c9aaec7 ceph.spec.in: re-re-drop fdupes
The %fdupes call was dropped by 53072b9019
Later, it got accidentally reinstated by ceb93e8e69

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-09-29 08:57:16 +02:00
Ken Dreyer
d73ca4f597 Merge pull request #5832 from SUSE/wip-drop-dup-rcceph
ceph.spec.in: refrain from duplicating %{_sbindir}/rcceph

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-09-28 13:09:38 -06:00
Boris Ranto
e44d1e07a7 ceph.spec.in: Fix up (/var)/run/ceph creation
Fixes: #13059
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-09-18 11:02:46 -04:00
Sage Weil
391cfb9f48 Merge pull request #5841 from ceph/wip-12994-rbd-replay-packaging
#12994: packaging: move rbd-replay* to ceph-common

Reviewed-by: James Page <jamespage@ubuntu.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2015-09-16 09:12:16 -04:00
Sage Weil
c1b28591a2 radosgw: log to /var/log/ceph instead of /var/log/radosgw
This is simpler.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-15 18:05:59 -04:00
Ken Dreyer
96486fd6f2 packaging: move rbd-replay* to ceph-common
The rbd-replay* utilities are useful for Ceph users with RBD clients.
Currently the rbd-replay* utilities ship in the "ceph-test" package, and
we intend this ceph-test package for Ceph developers and contributors,
not normal users.

Move the rbd-replay* utilities to "ceph-common".

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-09-15 14:01:18 -06:00
Sage Weil
8e13d89f0f systemd: eliminate ceph-rgw tmpfiles.d file
This is for storing the rgw socket files for fastcgi, which we do not
want to enable by default.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 14:00:26 -04:00
Sage Weil
8678a8acec kill /etc/security/limits.d/ceph
This only affects login shells; not useful.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-14 12:04:50 -04:00
Sage Weil
51abff1168 ceph.spec: respect CEPH_EXTRA_CONFIGURE_ARGS
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-12 14:12:20 -04:00
Sage Weil
4dea76e028 ceph.spec: include /etc/sysconfig/ceph
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 12:19:59 -04:00
Sage Weil
c8bfc354e1 ceph.spec: install /etc/sysconfig/ceph
Make it easy to enable jemalloc, too.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:38:26 -04:00
Sage Weil
6779bc2d24 Merge pull request #5869 from ceph/wip-rpm-dirs
ceph.spec: make /var/{lib,log,run} owned by ceph

Reviewed-by: Boris Ranto <branto@redhat.com>
2015-09-11 11:36:25 -04:00
Sage Weil
cbb8cf8328 Merge pull request #5540 from ceph/wip-selinux-radosgw
selinux: Update policy for radosgw

Reviewed-by: Milan Broz <mbroz@redhat.com>
2015-09-11 11:31:36 -04:00
Sage Weil
3aa38bc07f make /var/run/ceph 770 ceph:ceph
This allows members of the ceph group to make librados clients (like the
ceph cli and qemu) create sockets in the default /var/run/ceph/* location.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:26:59 -04:00
Sage Weil
e7837d1d36 ceph.spec: make /var/{lib,log,run} owned by ceph
Move creation of /var/lib/ceph and /var/run/ceph to ceph-common, too.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-11 11:24:18 -04:00
Boris Ranto
e5a8022ddb ceph.spec.in: ceph-radosgw should require ceph-selinux
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-09-11 11:08:13 +02:00
Boris Ranto
338bd3d177 selinux: Update policy for radosgw
The current SELinux policy does not cover radosgw daemon. This patch
introduces the SELinux support for radosgw daemon (civetweb only).

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-09-11 11:08:08 +02:00
Nathan Cutler
07a64b9720 ceph.spec.in: refrain from duplicating %{_sbindir}/rcceph
On systemd, systemd/ceph is installed to /usr/sbin/rcceph.

On non-systemd, src/init-ceph is installed to /etc/init.d/ceph and
/usr/sbin/rcceph is created as a symlink to the latter.

In the %files section, we mention %{_sbindir}/rcceph twice: once
in a non-systemd conditional and once outside of any conditional.
Drop the former.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-09-07 13:45:35 +02:00
Ken Dreyer
ed4cf3dcec Merge pull request #5193 from SUSE/wip-babeltrace-suse
ceph.spec.in: fix lttng/babeltrace conditionals

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-09-04 15:37:26 -06:00
Nathan Cutler
1c522be109 ceph.spec.in: put distro conditional around Group:
Neither RHEL and Fedora require a Group: line, so retain
only for SLE/openSUSE (and set the right value for these distros)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-09-04 20:07:13 +02:00
Ken Dreyer
8c17e01974 Merge pull request #5798 from SUSE/wip-fix-license
ceph.spec.in: fix License line

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-09-04 11:38:12 -06:00
Nathan Cutler
e267128ce2 ceph.spec.in: fix lttng/babeltrace conditionals
lttng and babeltrace are build dependencies for rbd-replay-prep. Make
sure the right package names are used. Enable for SLE12, as well as
for openSUSE 13.1 and higher.

Move the BuildRequires out of the ceph-test subpackage and into the
distro-conditional dependencies section.

Make ordering of BuildRequires a little more alphabetical.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>

sqme
2015-09-04 17:57:02 +02:00
Ken Dreyer
74fc195abe Merge pull request #5791 from SUSE/wip-drop-lsb-release
ceph.spec.in: drop lsb-release dependency from ceph-common

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-09-04 09:48:17 -06:00
Sage Weil
fbf4e6bebf ceph.spec: package new rgw files
/usr/bin/radosgw-object-expirer
   /usr/lib64/rados-classes/libcls_timeindex.so

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-03 18:41:26 -04:00
Sage Weil
df44a57949 ceph.spec: build requires cmake
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-03 15:01:53 -04:00
Nathan Cutler
ef7418421b ceph.spec.in: fix License line
This is closer to my reading of
https://github.com/ceph/ceph/blob/master/COPYING than the previous version.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-09-03 20:35:05 +02:00
Nathan Cutler
e54f89677d ceph.spec.in: drop redundant centos from conditionals
Since the %{rhel} macro is guaranteed to be defined on all CentOS
installations, the %{centos} macro is superfluous.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-09-03 16:32:08 +02:00
Nathan Cutler
75f2a98321 ceph.spec.in: clean up suse_version conditionals
Use 0%{?suse_version} throughout for consistency.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-09-03 16:32:04 +02:00
Nathan Cutler
929ca5b6ad ceph.spec.in: drop lsb-release dependency from ceph-common
It was there as an equivalent of redhat-lsb-core, but the redhat-lsb-core bits
that ceph-common relies on are included in insserv-compat on SUSE, and
insserv-compat is in base.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-09-03 16:16:30 +02:00
Sage Weil
3662a225b8 udev: use ceph-disk trigger ... with single set of udev rules
Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-01 11:22:25 -04:00
Sage Weil
f1b80e99b0 systemd: consolidate into a single ceph-disk@.service
This simple service will 'ceph-disk trigger DEV --sync'.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-09-01 11:22:25 -04:00
Sage Weil
403144f506 ceph.spec: package cls_numops
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-31 15:58:20 -04:00
Sage Weil
b518b6811f Merge pull request #5622 from ceph/wip-memstore
MemStore locking enhancements and bufferlist alternative

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2015-08-31 11:08:46 -04:00
Sage Weil
b224eb455a Merge pull request #4456 from ceph/wip-user
run ceph daemons as user and group ceph
2015-08-26 20:41:05 -04:00
Sage Weil
c825fd7604 Merge pull request #5674 from ceph/wip-selinux-post-script
ceph.spec.in: Restart services only if they are running

Reviewed-by: Milan Broz <mbroz@redhat.com>
2015-08-26 20:38:53 -04:00
Boris Ranto
ceb93e8e69 ceph.spec.in: User and group must be created in ceph-common pre-install script
The package ceph-common uses ceph user and group but they are both created in
ceph package %pre phase. We need to move the script to ceph-common %pre phase.

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-26 20:34:15 -04:00
Boris Ranto
e95904f704 ceph.spec.in: /var/lib/ceph is owned by ceph package
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-26 20:34:15 -04:00
Boris Ranto
d9df52b49a ceph.spec.in: Fix ceph.limits.d path
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-26 20:34:15 -04:00
Boris Ranto
2d4f3a9199 ceph.spec.in: Fixup uid/gid setting
We need to set the variables in the %pre phase, otherwise they are not properly
evaluated. Also use /sbin/nolongin instead of /bin/false and set the default
uid/gid pair for fedora and rhel (these were already allocated). We can also
use them for older fedora releases as they are guaranteed to be free.

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-26 20:34:15 -04:00
Danny Al-Gaaf
596c9b68c8 ceph.spec.in: install ceph.limits.d
limits.d expect the file to end with *.conf. Add the
installed file to package list of the ceph package.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-08-26 20:34:15 -04:00
Danny Al-Gaaf
ed0cd42d24 ceph.spec.in: add ceph user/group
Add support of create ceph user/group.

TODO: Add correct number for SUSE.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2015-08-26 20:34:15 -04:00
Sage Weil
c7ee798a0f set nofile ulimit in /etc/security/limits.d/ceph only
Specify the nofile ulimit in one standard place, where everyone expects it
to be.  Drop it from the ceph-osd unit file.

Leave upstart and sysvinit untouched for the time being to avoid compat
issues.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:34:15 -04:00
Sage Weil
3c56938280 ceph.spec: chown and chmod /var/lib/ceph and /var/log/ceph
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-26 20:34:14 -04:00
Casey Bodley
01a9a792a7 osbench: add multithreaded objectstore benchmark
usage: ceph_objectstore_bench [flags]
         --size
               total size in bytes
         --block-size
               block size in bytes for each write
         --repeats
               number of times to repeat the write cycle
         --threads
               number of threads to carry out this workload
         --multi-object
               have each thread write to a separate object

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2015-08-26 17:49:46 -04:00
Nathan Cutler
b610588bf4 ceph.spec.in: remove obsolete SUSE-specific code
http://tracker.ceph.com/issues/12791 Fixes: #12791

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-08-26 16:34:44 +02:00
Boris Ranto
c318129ba1 ceph.spec.in: Restart services only if they are running
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-26 13:54:12 +02:00
Sage Weil
f889151e46 Merge pull request #5650 from liewegas/wip-12736
uuid: use boost::random:random_device

Reviewed-by: Kefu Chai <kchai@redhat.com>
2015-08-25 21:46:11 -04:00
Nathan Cutler
d0386d2347 ceph.spec.in: drop sysvinit-specific macros that run only on openSUSE/SLE
All sysvinit-based versions of openSUSE/SLE are EOL as far as upstream Ceph is
concerned.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-08-25 13:49:47 +02:00
Sage Weil
dbcaa54485 uuid: use boost::random:random_device
The boost mt code uses uninitialized memory for extra randomness,
which is a bad idea in general but more importantly makes valgrind
unhappy.  Use /dev/urandom instead.

Unfortunately this introduces a link time dependency.. meh!

Fixes: #12736
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-24 14:51:47 -04:00
Rohan Mars
62bfc7a1ab moved to use boost uuid implementation, based on commit 4fe89a7b14
Signed-off-by: Rohan Mars <code@rohanmars.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
2015-08-19 06:46:17 -04:00
Boris Ranto
e4cff034e3 ceph.spec.in: Require awk for selinux post script
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-19 11:26:06 +02:00
Boris Ranto
9038488bc2 selinux: Relabel files if and only if the policy version changed
Currently, the ceph files are being relabelled every time the package is
rebuilt. Fix this by checking the policy versions and relabel the files
only if the policy actually changed (different policy version was
detected).

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-19 11:17:13 +02:00
Milan Broz
28d3c4c92b Do not use hardcoded paths in spec post section for selinux commands.
Signed-off-by: Milan Broz <mbroz@redhat.com>
2015-08-18 14:25:20 +02:00
Milan Broz
fa2203e951 Add dependence to selinux-policy-base to fix installation in kickstart.
Signed-off-by: Milan Broz <mbroz@redhat.com>
2015-08-18 14:25:04 +02:00
Milan Broz
14da7e20d9 Update rpm spec to properly restart systemd ceph.target.
If we are using systemd, ceph target should be used.
Also fail to restart service should not stop policy to load.

Signed-off-by: Milan Broz <mbroz@redhat.com>
2015-08-18 14:25:04 +02:00
Nathan Cutler
6c803cdf42 ceph.spec.in: test %preun argument is zero for removal-only operations
The %preun section now contains logic for disabling and stopping all the
Ceph systemd units when the ceph package is removed. However, there is no
conditional around it, so the units are disabled and stopped on RPM upgrade
as well as removal.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
2015-08-13 15:36:02 +02:00
Boris Ranto
8c53a5824a ceph.spec.in: Make SELinux opt-out, not opt-in
We should enable SELinux support by default on rpm-based systems that
build with SELinux support to get better QE coverage in future runs.

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-05 17:55:53 +02:00
Boris Ranto
c6d6c783f4 ceph.spec.in: stop/start service on policy upgrade/removal
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-05 15:21:47 +02:00
Boris Ranto
c52eb995e0 Add initial SELinux support
This patch modifies the build system and spec file to provide a support
for SELinux enforcing in an opt-in matter via ceph-selinux package.

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-08-05 15:21:41 +02:00
Sage Weil
8a67561220 ceph.spec: install the new systemd-based udev rules from ddiss
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-01 09:58:34 -04:00
Owen Synge
3d6100eb64 ceph.spec.in:Fixup renamed ceph-rgw.conf
This is a simple renaming bug.

Signed-off-by: Owen Synge <osynge@suse.com>
2015-08-01 09:58:34 -04:00
Owen Synge
e3e9548bba ceph.spec.in:fixup bad merge of systemd logic 2015-08-01 09:58:34 -04:00
Sage Weil
69cdfcb15f remove ceph-disk-{activate,prepare} wrappers
These ancient aliases shouldn't be used.  We should have removed them
immediately way back when, honestly.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-01 09:58:34 -04:00
Sage Weil
e034c2af43 ceph.spec: ship ceph-disk-* units
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-01 09:58:34 -04:00
Sage Weil
ac16d83914 ceph.spec: use sysvinit rbdmap script for now
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-01 09:58:34 -04:00
Sage Weil
d1ce1782ce ceph.spec: no rcceph[-radosgw] with systemd
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-01 09:58:33 -04:00
Sage Weil
6842a20915 systemd: add ceph-create-keys@ service
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-01 09:58:33 -04:00
Sage Weil
e283222d0a ceph.spec: include systemd units files
Signed-off-by: Sage Weil <sage@redhat.com>
2015-08-01 09:58:33 -04:00
Owen Synge
1ba4694d7e Autotools to install systemd unit files.
To simplify the spec file we should install as much using autotools
and as little as possible in the spec file.

Signed-off-by: Owen Synge <osynge@suse.com>
2015-08-01 09:58:33 -04:00
Owen Synge
d6213b61ab Add unit files to the spec file.
%{_unitdir}/ceph-mds@.service
%{_unitdir}/ceph-mon@.service
%{_unitdir}/ceph-osd@.service
%{_unitdir}/ceph.target

Signed-off-by: Owen Synge <osynge@suse.com>
2015-08-01 09:58:33 -04:00
Owen Synge
ef961be507 ceph.spec.in: Change redhat defaults for rgw
Changes
		--with-rgw-user=$USER \
		--with-rgw-group=$GROUP \

to
    USER=root
    GROUP=root

from
    USER=apache
    GROUP=apache

Signed-off-by: Owen Synge <osynge@suse.com>
2015-08-01 09:58:33 -04:00
Owen Synge
61240190c7 Added tmpfiles.d for rgw: templated user and group.
tmpfiles.d are part of system.d and define how temporary directories are setup.
rgw needs a socket directory. To do this we template tmpfiles.d user and group
for rgw and fill in the values using autotools.

Note1: Added to spec file.
Note2: Name changed to rgw from radosgw as is preferred name by Sage.
Note3: Adds configure options
    --with-rgw-user=UserName
    --with-rgw-group=GroupName
Note4: Defaults set for debian
Note5: spec file overrides defaults for redhat and suse

Signed-off-by: Owen Synge <osynge@suse.com>
2015-08-01 09:58:33 -04:00
Owen Synge
95db160da3 ceph.spec.in:Update rpm hooks and file content
Take rpm hooks from SUSE rpm and move upstream.
These are tested on SLE12 to include the correct files.

Signed-off-by: Owen Synge <osynge@suse.com>
2015-08-01 09:58:33 -04:00
Sage Weil
bbe84578bf remove rest-bench
This is a weak tool; users should look to cosbench or others instead.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-07-30 13:21:36 -04:00
Ken Dreyer
b8671fd176 Merge pull request #5261 from SUSE/wip-drop-py-requires
ceph.spec.in: drop SUSE-specific %py_requires macro

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-23 07:48:12 -06:00
Ken Dreyer
fbbed3afaa Merge pull request #5263 from SUSE/wip-apache-not-required
ceph.spec.in: remove SUSE-specific apache2-mod_fcgid dependency

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-23 07:46:27 -06:00
Kefu Chai
50a33dea0a package ceph-monstore-update-crush.sh
Fixes: #11815
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-17 19:15:44 +08:00
Nathan Cutler
f3f8d3660d ceph.spec.in: remove SUSE-specific apache2-mod_fcgid dependency
This package is no longer required for RGW to work in SUSE.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-16 16:49:42 +02:00
Nathan Cutler
cbf6c7b46b ceph.spec.in: drop SUSE-specific %py_requires macro
%py_requires expands to

BuildRequires: /usr/bin/python
PreReq: python = 2.7

The BuildRequires: is already provided, and the PreReq is wrong because
e.g. SLE11-SP3 (a platform we are trying to support) has Python 2.6.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-16 14:18:12 +02:00
Kefu Chai
cfc9f493f6 packaging: package libcls_cephfs.so
Signed-off-by: Kefu Chai <kchai@redhat.com>
2015-07-16 14:21:03 +08:00
Ken Dreyer
c74a2f86a1 packaging: RGW depends on /etc/mime.types
If the mimecap RPM or mime-support DEB is not installed, then the
/etc/mime.types file is not present on the system. RGW attempts to read
this file during startup, and if the file is not present, RGW logs an
error:

  ext_mime_map_init(): failed to open file=/etc/mime.types ret=-2

Make the radosgw package depend on the mailcap/mime-support packages so
that /etc/mime.types is always available on RGW systems.

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-15 09:14:15 -06:00
Gregory Farnum
d2f3ca8377 Merge pull request #4939 from ceph/wip-offline-backward
cephfs-data-scan (offline backward file recovery)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2015-07-14 11:42:48 +01:00
Ken Dreyer
50b4bdc18a ceph.spec.in: fix libs-compat / devel-compat conditional
In the RPM .spec's %files list, the "with libs-compat" conditional was
inadvertantly exended to cover the files list for ceph-devel-compat as
well.

The "with libs-compat" conditional should only cover the
"ceph-libs-compat" package, and not affect "ceph-devel-compat".

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-13 12:23:51 -06:00
Nathan Cutler
53072b9019 ceph.spec.in: do not run fdupes, even on SLE/openSUSE
In openSUSE there is a policy to use %fdupes in the spec file if RPMLINT
complains about duplicate files wasting space in the filesystem.

However, RPMLINT is not so complaining, so drop fdupes.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-13 18:17:22 +02:00
John Spray
cd6ead3583 packaging: add cephfs-data-scan
Signed-off-by: John Spray <john.spray@redhat.com>
2015-07-13 14:05:17 +01:00
Nathan Cutler
8a56c48259 packaging: add find and which dependencies
The postrotate script in src/logrotate.conf uses the which and find utilities
to do its work. Although logrotate itself is only a Recommends, I think which
and find are so ubiquitous that it makes sense to have them as hard
dependencies.

Also, I checked and the package names which and findutils are the same on all
the RPM distros we are currently targeting in the spec file.

In Debian, find is also in a package called findutils while the package
containing 'which' is called debianutils.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 21:59:39 +02:00
Ken Dreyer
6861db790a Merge pull request #5187 from SUSE/wip-12261
ceph.spec.in: install 95-ceph-osd.rules, mount.ceph, and mount.fuse.c…

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-09 13:44:57 -06:00
Ken Dreyer
ed6670fc1d Merge pull request #5181 from SUSE/wip-snappy-devel
ceph.spec.in: snappy-devel for all supported distros

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-09 13:43:41 -06:00
Ken Dreyer
52e1db9bf7 Merge pull request #5180 from SUSE/wip-add-missing-specfile-bit
ceph.spec.in: add missing -%{release}

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-07-09 13:42:42 -06:00
Ken Dreyer
6a6d82d92a Merge pull request #5076 from SUSE/wip-logrotate-hard-dependency
packaging: make logrotate a hard dependency across all distros

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>

 Conflicts:
	debian/control
2015-07-09 13:40:23 -06:00
Nathan Cutler
5ce38b9536 ceph.spec.in: install 95-ceph-osd.rules, mount.ceph, and mount.fuse.ceph properly on SUSE
http://tracker.ceph.com/issues/12261 Fixes: #12261

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 21:38:46 +02:00
Ken Dreyer
bc0992f2c0 Merge pull request #5079 from SUSE/wip-12166
ceph.spec.in: use %_udevrulesdir to eliminate conditionals
2015-07-09 12:55:54 -06:00
Ken Dreyer
90708bc806 Merge pull request #5126 from SUSE/wip-12201
ceph.spec.in: /var/run/ceph fixes

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2015-07-09 10:32:31 -06:00
Nathan Cutler
8aa758ee7a ceph.spec.in: use _udevrulesdir to eliminate conditionals
The conditionals governing where 50-rbd.rules is installed were not doing the
right thing on SUSE distros.

Start using the %_udevrulesdir RPM macro, while taking care that it is defined
and set to the right value. Use it to eliminate some conditionals around other
udev rules files as well.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 18:17:55 +02:00
Nathan Cutler
e4634ddcc1 ceph.spec.in: snappy-devel for all supported distros
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 13:28:22 +02:00
Nathan Cutler
1abaebd869 ceph.spec.in: make /var/run/ceph conditional
/var/run/ceph should only be installed on Fedora, RH/CentOS, and
all supported SUSE distros that do not have systemd (e.g. SLE11-SP3).

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 12:44:19 +02:00
Nathan Cutler
d952d59ae9 ceph.spec.in: add missing -%{release}
We have it everywhere else and I can't think of any reason why
it should be omitted here.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-09 12:27:17 +02:00
Boris Ranto
7db8a6a1d1 Remove git build-time dependency
The git command is currently only needed in the src/make_version script.
However, we can simply avoid it by assuming that if the git command is
not installed then the current dir is not a git repo.

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-07-08 17:16:29 +02:00
Nathan Cutler
4dd1e67de5 ceph.spec.in: fix _with_systemd conditional
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-07-03 10:18:44 +02:00