Commit Graph

565 Commits

Author SHA1 Message Date
Josh Durgin
426450472a Merge branch 'wip-11286' of https://github.com/dillaman/ceph
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-11-10 21:19:37 -08:00
Yehuda Sadeh
a5651b867a Revert 0374bb4a2f 2015-11-09 15:24:29 -08:00
Yehuda Sadeh
0374bb4a2f Merge pull request from ceph/wip-openssl
rgw: link against system openssl (instead of dlopen at runtime)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2015-11-09 13:56:29 -08:00
Boris Ranto
9224ac2ad2 rbdmap: systemd support
Fixes: 
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-11-06 10:26:22 +01:00
Jason Dillaman
78dbd13839 ceph.spec.in: add new cls_journal RADOS class
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-11-05 20:43:49 -05:00
Boris Ranto
c0980af3c7 rbdmap: Move do_map and do_unmap shell functions to rbdmap script
This patch creates rbdmap shell script that is called from init-rbdmap
init script. The patch also renames src/rbdmap configuration file to
src/etc-rbdmap so that rbdmap shell script can be installed via build
system directly. Finally, the patch accomodates these changes in spec
file and build system.

Fixes: 
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-11-05 21:04:50 +01:00
Sage Weil
3eccde9d9c Merge tag 'v9.2.0'
v9.2.0
2015-11-04 19:40:17 -05:00
Sage Weil
173bfd03c4 rgw: link against system openssl (instead of dlopen at runtime)
Signed-off-by: Sage Weil <sage@redhat.com>
2015-10-29 01:06:36 -04:00
Boris Ranto
1560057226 ceph.spec.in: We no longer need redhat-lsb-core
Drop the redhat-lsb-core dependency as it is no longer necessary on
fedora/rhel.

The other two init scripts do not use redhat-lsb-core either. The
init-ceph.in conditionally requires /lib/lsb/init-functions and does not
use any of the functions defined in that file (at least not directly).
The init-radosgw file includes /etc/rc.d/init.d/functions on non-debian
platforms instead of /lib/lsb/init-functions file so it does not require
redhat-lsb-core either.

Signed-off-by: Boris Ranto <branto@redhat.com>
2015-10-23 16:53:41 +02:00
Sage Weil
08b381e2fc Merge pull request from ceph/wip-12315-libs-compat-conditional
ceph.spec.in: fix libs-compat / devel-compat conditional

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2015-10-18 14:34:47 -04:00
Josh Durgin
28131505b8 Merge pull request from dillaman/wip-13274-infernalis
LTTng-UST tracing should be dynamically enabled

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2015-10-15 18:07:09 -04:00
Jason Dillaman
477bb064e8 ceph.spec.in: only run systemd-tmpfiles on ceph run directory
There is a kmod bug that affects RHEL7 derivatives which will
result in device permissions being reset back to defaults.

Fixes: 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-14 16:41:32 -04:00
Jason Dillaman
f4feee2f9d ceph.spec.in: add new tracepoint probe shared libraries
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2015-10-14 12:06:47 -04:00
Sage Weil
1e017ef63d Merge pull request from SUSE/wip-drop-my-conf-opt
ceph.spec.in: drop MY_CONF_OPTS

Reviewed-by: Ken Dreyer, <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2015-10-09 16:34:25 -04:00
Sage Weil
4b7cf9ce83 Merge pull request from ceph/wip-fix-selinux-man-page
Fix selinux man page

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2015-10-09 16:33:48 -04:00
Nathan Cutler
5a11d7618e ceph.spec.in: move python-sphinx BuildRequires to the right section
These belong in the section for distro-conditional dependencies.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-07 17:47:14 +02:00
Nathan Cutler
96aabe7610 ceph.spec.in: move BuildRequires out of subpackages
Since the main package and all the subpackages are built in the
same environment, concentrate all the BuildRequires in the main
package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-07 17:47:14 +02:00
Nathan Cutler
d258bf5852 ceph.spec.in: drop MY_CONF_OPTS
http://tracker.ceph.com/issues/13402 Fixes: 

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-07 17:32:27 +02:00
Nathan Cutler
378d56d1e2 man/Makefile-server.am: conditionalize make ceph_selinux manpage
http://tracker.ceph.com/issues/13353 Fixes: 

Modified-by: Boris Ranto <branto@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 18:08:15 +02:00
branto1
e5a6529afc Merge pull request from SUSE/wip-infernalis-obs
Get infernalis to build in openSUSE Build Service

Reviewed-by: Boris Ranto <branto@redhat.com>
2015-10-06 18:05:52 +02:00
Nathan Cutler
1045291594 ceph.spec.in: remove comments regarding ceph UID/GID in SUSE
It is possible that the ceph user/group will not have fixed UID/GID in SUSE.
Instead, it is possible that the ceph package will depend on a separate package
whose sole purpose will be to create the ceph user/group if they do not exist.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 15:18:53 +02:00
Nathan Cutler
800d974610 ceph.spec.in: enable OBS post-build-checks to find systemd-tmpfiles
The openSUSE Build Service runs a number of "post-build checks" after the RPMs
have been generated. One of these tests the RPM scriptlets for idempotence.
Without this line in the specfile, the check fails on SLE_12 because it cannot
find the systemd-tmpfiles binary.

http://tracker.ceph.com/issues/13375 Fixes: 

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 15:18:53 +02:00
Nathan Cutler
f8895fc70b ceph.spec.in: Standardize systemd preun and postun scripts
Currently, the main ceph package and the ceph-radosgw behave
differently on upgrade. This commit unifies their behavior
to the following:

On package removal, disable and stop all related systemd units.

On package upgrade, do nothing unless there is a file /etc/sysconfig/ceph
containing a parameter CEPH_AUTO_RESTART_ON_UPGRADE. If parameter is set
to "yes", restart the systemd units iff they are running.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 15:18:25 +02:00
Nathan Cutler
404ffab739 ceph.spec.in: fix for out-of-memory errors in OBS
Add "--param ggc-min-expand=20 --param ggc-min-heapsize=32768"
to RPM_OPT_FLAGS, ensuring gcc does not add debug symbols and is
more aggressive about garbage collection.

Thanks to Berthold Gunreben for debugging this issue.

http://tracker.ceph.com/issues/13352 Fixes: 

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:41 +02:00
Nathan Cutler
db4727f943 ceph.spec.in: Use _smp_mflags instead of _NPROCESSORS_ONLN
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:41 +02:00
Nathan Cutler
5dd93d7de1 ceph.spec.in: selinux by default on RHEL/Fedora, non-default on SUSE
Surround it with an appropriate conditional.

http://tracker.ceph.com/issues/13324 Fixes: 

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:41 +02:00
Nathan Cutler
9e226a8081 ceph.spec.in: use %fillup_only macro in SLE/openSUSE
SUSE does not allow /etc/sysconfig/ceph to be owned by the ceph
package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:41 +02:00
Nathan Cutler
2c6977cd5f ceph.spec.in: distro-conditional groupadd and useradd
The -o option to groupadd/useradd is not recognized in SLE12. For
SLE/openSUSE, follow the openSUSE packaging guidelines.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:40 +02:00
Nathan Cutler
0dd9313628 ceph.spec.in: move systemd-tmpfiles stuff to ceph-common
Since the ceph user and group are created in the ceph-common
%pre scriptlet, the systemd-tmpfiles --create command needs
to run in that package.

tracker.ceph.com/issues/13346 Fixes: 

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:40:38 +02:00
Nathan Cutler
d58d885dac ceph.spec.in: remove SUSE-specific curses hack
Unclear what this was supposed to fix.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 14:33:57 +02:00
Nathan Cutler
bf9ca1eb10 ceph.spec.in: lttng in SLES12 only
Over in the SUSE sector, we are trying to enable the SLE_12 and openSUSE_13.2
build targets. The lttng/babeltrace stuff is currently available only in
SLE_12.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 12:34:07 +02:00
Nathan Cutler
50567b4964 ceph.spec.in: drop %insserv_prereq (obsoleted by systemd)
The %post, etc. scriptlets are no longer calling %insserv, et al.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 12:34:07 +02:00
Nathan Cutler
c84722a9a6 ceph.spec.in: fix boost-random build dependency for SLE/openSUSE
In Fedora, RHEL and CentOS there is a package called boost-random.
In SLE/openSUSE, there is no such package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-10-06 12:33:26 +02:00
Sage Weil
42a2c340e1 Merge pull request from ceph/wip-13061
ceph.spec.in: Do not always restart the daemons on upgrades/removal

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-10-05 16:12:57 -04:00
Nathan Cutler
929e5d04a0 ceph.spec.in: correctly declare systemd dependency for SLE/openSUSE
Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 7b1882f875)
2015-10-02 21:24:09 +02:00
Boris Ranto
b9159521f4 ceph.spec.in: Do not always restart the daemons on removal
There is no need to restart the daemons when removing ceph-selinux
package if SELinux is not enabled.

Fixes: 
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-10-02 12:19:14 +02:00
Boris Ranto
c95c14ba25 ceph.spec.in: Do not always restart the daemons on upgrades
This patch minimizes the amount of daemon stop/start procedures when
upgrading ceph-selinux package. With this patch, the daemons get
restarted only if SELinux is enabled and the SELinux policy version
changed in the meantime.

Fixes: 
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-10-02 12:19:07 +02:00
branto1
8322a5c2a6 Merge pull request 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 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: 
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-09-18 11:02:46 -04:00
Sage Weil
391cfb9f48 Merge pull request from ceph/wip-12994-rbd-replay-packaging
: 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: 

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 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