Commit Graph

523 Commits

Author SHA1 Message Date
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
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