Commit Graph

927 Commits

Author SHA1 Message Date
Nathan Cutler
51cbbfe924 rpm: align librgw-devel dependencies with debian packaging
Fixes: http://tracker.ceph.com/issues/16346
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-03 12:30:49 +02:00
Nathan Cutler
bd8b51815d rpm: remove major version from shared library devel pkg names
Fixes: http://tracker.ceph.com/issues/16345
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-03 12:30:49 +02:00
John Spray
2dbff88acc Merge pull request #10243 from jcsp/wip-cephfs-cleanup
CephFS: misc. cleanups and remove legacy cephfs tool

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-07-25 15:20:42 +01:00
Nathan Cutler
94e4f2190b rpm: move libatomic_ops-devel to non-distro-specific section
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-07-22 20:42:02 +02:00
Nathan Cutler
06940e29b7 rpm: move gperftools-devel to non-distro-specific section
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-07-22 20:42:02 +02:00
Nathan Cutler
c835f6ddf5 rpm: use new name of libatomic_ops-devel
The previous form, libatomic-ops-devel, has been deprecated since May 23, 2012.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-07-22 20:42:02 +02:00
Ricardo Dias
976c9d4f31
rpm: Fix creation of mount.ceph symbolic link for SUSE distros
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-07-19 15:40:36 +01:00
John Spray
c76c31d312 tools: remove legacy cephfs tool
This has been deprecated for quite some time, in favour
of using proper vxattr and libcephfs interfaces.

Fixes: http://tracker.ceph.com/issues/16035
Signed-off-by: John Spray <john.spray@redhat.com>
2016-07-19 14:00:30 +01:00
Nathan Cutler
b8c24bf2f8 rpm: move mount.ceph from ceph-base to ceph-common
Ceph clients use mount.ceph to mount CephFS filesystems, and
ceph-base is not expected to be installed on client systems.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-07-18 16:16:11 +02:00
Nathan Cutler
b090e9da32 rpm: create mount.ceph symlink in /sbin (SUSE only)
Fixes: http://tracker.ceph.com/issues/16598
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-07-18 15:36:29 +02:00
Kefu Chai
c8b36efd15 rpm: build rpm with cmake
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-07-06 10:07:20 +08:00
runsisi
49dfad1f53 ceph.spec.in: fix rpm package building error as follows:
error: Installed (but unpackaged) file(s) found:
      /usr/lib/udev/rules.d/60-ceph-by-parttypeuuid.rules

Signed-off-by: runsisi <runsisi@zte.com.cn>
2016-07-04 13:52:03 +08:00
Loic Dachary
b8a4ca7e4c Merge pull request #9885 from dachary/wip-16351-by-parttypeuuid
udev: always populate /dev/disk/by-parttypeuuid

Reviewed-by: Alexandre Derumier <aderumier@odiso.com>
2016-07-03 13:31:46 +02:00
Nathan Cutler
0efbb5ae8d ceph.spec.in: systemctl preset on install only
Loading presets is only necessary on install, not on update.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-06-27 21:16:54 +02:00
Boris Ranto
936d3ca837 rpm: Do not start targets on update
We do not want to start the targets on upgrade, this would override the
user configuration and is a bad practice. This commit fixes the
behaviour.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-06-27 20:20:30 +02:00
Sage Weil
1ddc00b45c Merge pull request #8818 from SUSE/wip-drop-ceph-ra
ocf: drop ceph Resource Agent

Reviewed-by: Tim Serong <tserong@suse.com>
2016-06-23 12:18:54 -04:00
Loic Dachary
35004a628b udev: always populate /dev/disk/by-parttypeuuid
ceph-disk activate-all walks /dev/disk/by-parttypeuuid at boot time. It
is not necessary when udev fires ADD event for each partition and
95-ceph-osd.rules gets a chance to activate a ceph disk or journal.

There are various reasons why udev ADD events may not be fired at
boot (for instance Debian Jessi 8.5 never does it and CentOS 7.2 seems
to be racy in that regard when a LVM root is being used).

Populating /dev/disk/by-parttypeuuid fixes ceph-disk activate-all that
would not work without it. And it guarantees disks are activated at boot
time regardless of wether udev fires ADD events at the right time (or at
all).

The new udev file is a partial resurection of the
60-ceph-partuuid-workaround-rules that was removed by
9f77244b8e. It is given a name that
reflects its new purpose.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-06-23 09:37:05 +02:00
Kefu Chai
70bbf1aded configure.ac,debian,rpm: do not package .a files in rpm/deb packages
this change removes *.a from -dev or -devel packages.

* configure.ac:
  - use LT_INIT instead of AM_PROG_LIBTOOL. the later is deprecated.
  - disable static lib:
    .a static libraries not not useful, it's tricky to generate both
    static libraries and shared libraries in cmake.
    see http://www.spinics.net/lists/ceph-devel/msg30637.html
* ceph.spec.in: fedora packaging policy forbids this
  see
  https://fedoraproject.org/wiki/Packaging:Guidelines#Packaging_Static_Libraries
* debian/*-dev.install: debian does not requires this
  see
  https://www.debian.org/doc/debian-policy/ch-sharedlibs.html#s-sharedlibs-static

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-07 14:08:59 +08:00
Kefu Chai
d596146e6d makefile,debian,rpm: do not package librgw_file* anymore
they are unit tests for rgw.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-07 14:08:59 +08:00
Kefu Chai
52021ff9f0 makefile: install mount.fuse.ceph,mount.ceph into /usr/sbin
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-06-04 09:37:33 +08:00
Nathan Cutler
048aa3f0e7 Merge pull request #9106 from SUSE/wip-15869
rpm: unconditionally set ceph user's primary group to ceph (SUSE) 

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2016-06-01 18:14:38 +02:00
Ken Dreyer
115349680b packaging: move parted requirement to -osd subpkg
Prior to this change, ceph-base required the "parted" package, which
meant that any installation of ceph-osd, ceph-mon, or ceph-mds would
pull in the parted package.

Move the parted dependency to ceph-osd, since ceph-disk is the only
thing that uses parted.

The advantage of this change is that Mon and MDS systems will not need
to install the parted package.

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-05-31 17:51:55 -06:00
Ken Dreyer
4353eb2721 packaging: drop python-flask dependency from radosgw
The PowerDNS integration code itself is not packaged at this point, so
remove the python-flask dependency from the radosgw package.

Maybe the PowerDNS integration bits could live in a separate
sub-package, eventually.

Fixes: http://tracker.ceph.com/issues/16032
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-05-25 23:28:09 -06:00
Boris Ranto
6de39ce737 rpm: Restore /var/run/ceph context manually
The fixfiles command won't fix label for /var/run/ceph (/run is probably
excluded from relabel), we need to restore the context manually.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-23 21:59:14 +02:00
Boris Ranto
3c104b1065 rpm: Mute semodule in postun script
Currently, we don't mute the semodule output in postun script. This
results in the following message when removing ceph-selinux package:

libsemanage.semanage_direct_remove_key: Removing last ceph module (no
other ceph module exists at another priority).

The fix is to simply mute the output of the command.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-23 21:59:14 +02:00
Boris Ranto
bef5ea7833 Revert "rpm: put /sbin/ldconfig into -p"
This reverts commit a53d932fc4.

If the interpret is passed to postun script, everything until the next
rpm section gets interpreted as the input for the interpret (in this
case ldconfig). This results in warnings like

/sbin/ldconfig: relative path `0' used to build cache

when removing the packages that pass the interpret because we use
several '#' characters to separate the subpackage sections and these get
passed to the ldconfig.

Using the default interpret (bash) fixes the warning. I'm also doing the
same to %post script for consistency.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-23 21:58:38 +02:00
Ken Dreyer
d87448da79 ceph.spec.in: use %autosetup macro
New in rpm 4.11,
http://www.rpm.org/wiki/PackagerDocs/Autosetup

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-05-20 07:23:53 -06:00
Nathan Cutler
b3dfa8d909 rpm: unconditionally set ceph user's primary group to ceph (SUSE)
This commit brings the user/group creation into greater semantic alignment
with the Debian packaging.

Fixes: http://tracker.ceph.com/issues/15869
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-12 21:42:11 +02:00
Boris Ranto
7e606f29f4 rpm: Drop SELinux priority setting
Older versions of semodule binary that are in Centos/RHEL do not
support priority setting, dropping it.

Fixes: #15822
Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-10 18:21:50 +02:00
Dan Horák
efa7f7b365 fix tcmalloc handling in spec file
- there is no gperftools/tcmalloc on s390(x) yet
- explicitly disable tcmalloc when built without

Signed-off-by: Dan Horák <dan@danny.cz>
2016-05-06 13:45:30 +02:00
Boris Ranto
efe4e620bf rpm: Fix SELinux relabel on fedora
The SELinux userspace utilities stopped providing versions when they
switched to CIL language. We need to use a different technique to
relabel the files.

Fixes: #15725
Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-06 13:44:16 +02:00
Nathan Cutler
71cbc832de Test-enable XIO messenger and IB/RDMA support
Fixes: http://tracker.ceph.com/issues/15472

Signed-off-by: Lars Marowsky-Bree <lmb@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:16 +02:00
Sage Weil
266ccccccf debian,rpm: add jq build dependency
Needed since db517ba917.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-06 13:44:16 +02:00
Nathan Cutler
827edbae94 rpm: do a full make check when --with-tests is given
The check-local target tests the CLI tools only.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
0d75ab1854 rpm: drop sysvinit bits from relabel_files function
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
861e75d5ec rpm: replace literal paths with RPM macros
The only place we should write out literal paths is in the RPM scriptlets,
and there only for things that are not installed by this package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
c86e0021d6 rpm: drop udev/95-ceph-osd-alt.rules
This udev rules file was needed on older RHEL platforms, which are
unsupported as of jewel.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
1cf896cbb5 rpm: global replace $RPM_BUILD_ROOT with %{buildroot}
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
454fb72f78 rpm: put dependencies in alphabetical order
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
a53d932fc4 rpm: put /sbin/ldconfig into -p
This saves approximately 1 second per invocation.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
88cbe05701 rpm: drop sysvinit-specific dependencies
Obsolete in jewel and above.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
d77d10f345 rpm: move boost-random dependency to appropriate section
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
1ff78261b2 rpm: move unified python-sphinx build dependency
Now that the python-sphinx build dependency is unified, move it
to the proper section of the spec file.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
7d10503fef rpm: drop dead conditionals
This commit drops conditionals that no longer serve any purpose, since
jewel and above do not support the distro versions they are checking for.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
f77015c1dc rpm: drop python-argparse dependency
This was only necessary for older (now unsupported) distro versions.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
1893b863aa rpm: drop _with_systemd
Ceph versions jewel and above only support systemd.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
d2bae7c496 rpm: drop init-ceph.in-fedora.patch
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
1cefe40506 rpm: drop python_sitelib/sitearch conditional
This conditional was required to support older versions of RHEL/CentOS that are
no longer supported in infernalis and above.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-06 13:44:15 +02:00
Nathan Cutler
bb624c7334 Drop ceph Resource Agent
This RA wraps the ceph sysvinit script. As of Jewel, none of the supported
distros are using sysvinit anymore. So, drop it.

Incidentally, Pacemaker can control systemd units without any wrappers.

References: http://tracker.ceph.com/issues/14828
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-05 10:38:46 +02:00
Nathan Cutler
e1514809ae rpm: do a full make check when --with-tests is given
The check-local target tests the CLI tools only.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:38:46 +02:00
Nathan Cutler
20df58799a rpm: drop sysvinit bits from relabel_files function
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:38:45 +02:00
Nathan Cutler
e0346b36fc rpm: replace literal paths with RPM macros
The only place we should write out literal paths is in the RPM scriptlets,
and there only for things that are not installed by this package.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:38:45 +02:00
Nathan Cutler
ee4acb3159 rpm: drop udev/95-ceph-osd-alt.rules
This udev rules file was needed on older RHEL platforms, which are
unsupported as of jewel.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:38:45 +02:00
Nathan Cutler
bed92b6a86 rpm: global replace $RPM_BUILD_ROOT with %{buildroot}
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:38:42 +02:00
Nathan Cutler
66042c03df rpm: put dependencies in alphabetical order
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:17 +02:00
Nathan Cutler
7ae46e342e rpm: put /sbin/ldconfig into -p
This saves approximately 1 second per invocation.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:17 +02:00
Nathan Cutler
c655cb896a rpm: drop sysvinit-specific dependencies
Obsolete in jewel and above.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:17 +02:00
Nathan Cutler
46b16c19f7 rpm: move boost-random dependency to appropriate section
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:17 +02:00
Nathan Cutler
1d897da861 rpm: move unified python-sphinx build dependency
Now that the python-sphinx build dependency is unified, move it
to the proper section of the spec file.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:16 +02:00
Nathan Cutler
1332fac70e rpm: drop dead conditionals
This commit drops conditionals that no longer serve any purpose, since
jewel and above do not support the distro versions they are checking for.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:16 +02:00
Nathan Cutler
6c42066d48 rpm: drop python-argparse dependency
This was only necessary for older (now unsupported) distro versions.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:16 +02:00
Nathan Cutler
2ca6dd250b rpm: drop _with_systemd
Ceph versions jewel and above only support systemd.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:16 +02:00
Nathan Cutler
e8cf501d0f rpm: drop init-ceph.in-fedora.patch
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:16 +02:00
Nathan Cutler
98d52120f8 rpm: drop python_sitelib/sitearch conditional
This conditional was required to support older versions of RHEL/CentOS that are
no longer supported in infernalis and above.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-05-04 15:30:16 +02:00
Boris Ranto
0bbfea5cf1 test/ec: build the libs only when 'make check'
Currently, we are always building the erasure code libraries while we
need them only when 'make check' is run. Moving the test libraries to
check_LTLIBRARIES should fix this for us.

We no longer need to remove the libec libs manually, remove the lines
that do that.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-04 12:16:20 +02:00
Boris Ranto
14652f3216 rpm: Add rpm scripts for ceph-rbd-mirror
We are currently missing the systemd scripts for the new ceph-rbd-mirror
daemons. This patch introduces them.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-04-27 18:14:51 +02:00
Boris Ranto
73f4579867 rpm: Start all the targets in %post
We need to have the sub-targets active for the ceph.target to be able
to propagate its calls to the services. If the sub-target is inactive,
the main target won't propagate the stop/restart calls.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-04-27 18:00:12 +02:00
Nathan Cutler
644aba9270 rpm: implement scriptlets for the post-split daemon packages
This patch gives each of the ceph-{mds,mon,osd,radosgw} packages its own
%post, %preun, and %postun scriptlets dealing with the package's unit files.

The scriptlets of ceph-base are adapted to handle the ceph.target unit file
only.

The scriptlets of ceph-mon handle ceph-create-keys services in addition to ceph-mon.

The scriptlets of ceph-osd handle ceph-disk services in addition to ceph-osd.

Fixes: http://tracker.ceph.com/issues/14941
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Boris Ranto <branto@redhat.com>
2016-04-27 14:24:51 +02:00
Nathan Cutler
53b1a6799c systemd: enable all the ceph .target services by default
Some distros, like Fedora and openSUSE, have a policy that all services are
disabled by default.

This patch changes that default for the ceph.target and
ceph-{mds,mon,osd,radosgw}.target services.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Boris Ranto <branto@redhat.com>
2016-04-27 14:20:29 +02:00
Nathan Cutler
2310854745 ceph.spec.in: recommend ntp-daemon on SUSE
SUSE has settled on "ntp-daemon" as the generic package name. The "ntp" and
"chrony" etc. packages have "Provides: ntp-daemon" in their respective spec
files.

References: http://tracker.ceph.com/issues/15419
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-04-25 22:16:19 +02:00
Boris Ranto
0c56bcaef6 Merge pull request #8667 from SUSE/wip-15549
rpm: refrain from installing systemd unit files twice

Reviewed-by: Boris Ranto <branto@redhat.com>
2016-04-21 08:17:55 +02:00
Nathan Cutler
6d3cbaa509 rpm: refrain from installing systemd unit files twice
These files are already installed by systemd/Makefile.am

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-04-20 19:04:33 +02:00
Sage Weil
9f77244b8e udev: remove 60-ceph-partuuid-workaround-rules
These were added to get /dev/disk/by-partuuid/ symlinks to work on
wheezy.  They are no longer needed for the supported distros (el7+,
jessie+, trusty+), and they apparently break dm by opening devices they
should not.

Fixes: http://tracker.ceph.com/issues/15516
Signed-off-by: Sage Weil <sage@redhat.com>
2016-04-18 09:16:02 -04:00
Nathan Cutler
3108c34d50 ceph.spec.in: terminate if statement in %pre scriptlet
One of the if statements in the ceph-common %pre scriptlet was not properly
terminated.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-04-16 13:48:03 +02:00
Kefu Chai
dbd9bb1174 Merge pull request #7857 from tchaikov/wip-14844
ceph.spec.in: enable lttng and babeltrace explicitly

thanks to ktdreyer, we have lttng and babel in EPEL-7 now.

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-03-30 14:47:34 +08:00
Loic Dachary
0ab4813092 script: subscription-manager support (part 2)
Strip the .py suffix so that no pyc / pyo files are generated.
Do not install on CentOS.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-26 19:20:57 +01:00
Josh Durgin
20c86506ae Merge pull request #8224 from SUSE/wip-15212
rbdmap: add manpage

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-24 09:19:48 -07:00
Sage Weil
f9b079e0af Merge pull request #7907 from dachary/wip-subman-facts
script: subscription-manager support

Reviewed-by: Boris Ranto <branto@redhat.com>
2016-03-23 17:05:47 -04:00
Nathan Cutler
d01d983ad4 packaging: rbdmap manpage
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-23 15:05:16 +01:00
Nathan Cutler
c2909465f8 RPM: prefer UID/GID 167 when creating ceph user/group
This change affects openSUSE/SLE only.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-23 14:38:14 +01:00
Yehuda Sadeh
5df0653723 Merge pull request #8225 from SUSE/wip-radosgw-description
packaging: align radosgw package description

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-03-21 13:41:28 -07:00
Josh Durgin
227b943d38 Merge pull request #8217 from ceph/wip-rbd-mirror-init
rbd-mirror: systemd and upstart init scripts

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-03-21 13:35:31 -07:00
Sage Weil
19aabf4a30 Merge pull request #8016 from ErwanAliasr1/evelu-15042
rpm,deb: remove conditional BuildRequires for btrfs-progs

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-03-21 07:41:55 -04:00
Nathan Cutler
c4364b13b7 packaging: align radosgw package description
First, make the Debian package description mention that RGW aims to
implement the Swift API.

Second, replace the RPM package description with the Debian one, both for
consistency and because the Debian one is better.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-19 22:43:53 +01:00
Jason Dillaman
f5375dcd1f packaging: added rbd-mirror startup scripts
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-03-18 17:53:06 -04:00
branto1
97b709c1b4 Merge pull request #8137 from ceph/wip-15146-ceph-dep
rpm: remove sub-package dependencies on "ceph"

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Jun Huang <hjwsm1989@gmail.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ali Maredia <amaredia@redhat.com>
2016-03-18 10:10:35 +01:00
Loic Dachary
1b0e6397a7 script: subscription-manager support
The script is designed to create a fact file for subscription-manager to
consume. It is run hourly from /etc/cron.hourly on RHEL.

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

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-03-17 11:07:34 +01:00
branto1
8be0a35c67 Merge pull request #8133 from ceph/wip-15145-cephfs-tools
packaging: move cephfs repair tools to ceph-common

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-03-16 16:52:01 +01:00
Loic Dachary
6364e5ff0a Merge pull request #7894 from SUSE/wip-14828
ceph.spec.in: do not install Ceph RA on systemd platforms

Reviewed-by: Tim Serong <tserong@suse.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-03-16 14:10:15 +01:00
Boris Ranto
ff3f0f868d ceph.spec.in: Make ceph-common require libcephfs1
We recently moved fsck/repair tools to ceph-common package. We should
also make the version/release requirements tight.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-03-16 12:15:33 +01:00
Ken Dreyer
fe6dc35af5 packaging: remove sub-package dependencies on "ceph"
One side effect of the recent package split (in #10587) is that "ceph"
is now an empty meta-package.

We should not have any packages that depend on "ceph" any more. Change
the various sub-packages to either drop the dependency altogether, or
just Require: ceph-base instead.

Fixes: #15146
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-03-15 12:56:54 -06:00
Ken Dreyer
5f3f37f9c0 packaging: move cephfs repair tools to ceph-common
The CephFS repair tools are generally useful to run on any node, not
just the MDS nodes themselves.

Move the utilities from the ceph-mds package to the ceph-common package.

Fixes: #15145
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-03-15 11:13:39 -06:00
Nathan Cutler
3214ae99f7 RPM: fix openldap and openssl build dependencies for SUSE
http://tracker.ceph.com/issues/15138 Fixes: #15138

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-15 14:46:54 +01:00
Matt Benjamin
de8367bc27 rgw: require openldap library client headers
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-12 13:02:58 -08:00
Kefu Chai
f1a44907a2 ceph.spec.in: disable lttng and babeltrace explicitly
before this change, we do not pacakge tracepoint probe shared libraries
on rhel7. but "configure" script enables them if lttng is detected. and
rpm complains at seeing installed but not pacakged files. as EPEL-7 now
includes lttng-ust-devel and libbabeltrace-devel, we'd better
BuildRequire them, and build with them unless disabled otherwise. so in
this change
* make "lttng" an rpm build option enabled by default
* BuildRequire lttng-ust-devel and libbabeltrace-devel if the "lttng"
 "lttng" option is enabled
* --without-lttng --without-babeltrace if the "lttng" option is disabled

Fixes: #14844
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-03-12 11:07:09 +08:00
Erwan Velu
2294c73d39 Packaging: Removing conditional BuildRequires for btrfs-progs
By pull request 7742, the btrfs-progs package was considered as a BuildRequires
only when --with tests was engaged like :

    if %{with tests}
    BuildRequires: btrfsprogs
    %endif

That's perfectly valid for a spec file.

The issue we have is the following :
- yum-builddep called by install-deps.sh is used to prepare the build env by
installing the needed BuildRequires.
- %{with test} is defined by using a %bcond_with
- yum-builddep doesn't consider %{with test} as valid
- yum-builddep doesn't install the btrfs package

As per discussions with the yum team, there is no way to engage conditional flags with
yum-builddep.

So this patch, as per discussions with Nathan Cutler & Loic Dachary, is removing
the condition arond the BuildRequires.

Note that all BuildRequires defined with a %bcond_with would be affected by this
issue. The current specfile only have %bcond_without conditional BuildRequires
which is fine.

Fixes: #15042
Signed-off-by: Erwan Velu <erwan@redhat.com>
2016-03-10 09:15:14 +01:00
Matt Benjamin
2bb6ef9d84 rgw: ldap token glue
Based on feedback from upstream RGW, introduce a new json-format
token structure representing credentials for pass-through authentication
(e.g., LDAP without Keystone's digest authentication).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-03-09 10:54:35 -05:00
Erwan Velu
754d2103e1 packaging: Moving Cython into distro specific area
To get the spec file into a consistent state, let's move Cython into the distro
specific are of the spec file.

Signed-off-by: Erwan Velu <erwan@redhat.com>
2016-03-07 20:27:07 +01:00
Erwan Velu
019d9e17a7 packaging: Adding redhat-rpm-config
Some part of the rados compilation process is expecting redhat-hardened-cc1.
That's surely because of the FORTIFY compilation flag.

redhat-hardened-cc1 is part of the redhat-rpm-config so let's put it as a build
dependency.

The typical output when this issue is occuring :

cd ./pybind/rados; CPPFLAGS="-iquote \/ceph/src/include -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D__STDC_FORMAT_MACROS -D_GNU_SOURCE -DCEPH_LIBDIR=\"/usr/local/lib\" -DCEPH_PKGLIBDIR=\"/usr/local/lib/ceph\" -DGTEST_USE_OWN_TR1_TUPLE=0 -D_REENTRANT    " CFLAGS="-iquote \/ceph/src/include -Wall -Wtype-limits -Wignored-qualifiers -Winit-self -Wpointer-arith  -fno-strict-aliasing -fsigned-char -rdynamic -O2 -g -pipe -Wall -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fPIE -fstack-protector-strong  -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free  -g -O2" LDFLAGS="-L\/ceph/src/.libs -Wl,--as-needed  -Wl,-z,relro -Wl,-z,now  -latomic_ops " CYTHON_BUILD_DIR="/ceph/src/build" /bin/python ./setup.py build \
--build-base /ceph/src/build \
--verbose
Compiling rados.pyx because it changed.
Cythonizing rados.pyx
  CXXLD    libradosstriper.la
  CXXLD    librbd.la
  CXXLD    librgw.la
running build
running build_ext
building 'rados' extension
gcc -pthread -fno-strict-aliasing -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m64 -mtune=generic -D_GNU_SOURCE -fPIC -fwrapv -DNDEBUG -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m64 -mtune=generic -D_GNU_SOURCE -fPIC -fwrapv -iquote /ceph/src/include -Wall -Wtype-limits -Wignored-qualifiers -Winit-self -Wpointer-arith -fno-strict-aliasing -fsigned-char -rdynamic -O2 -g -pipe -Wall -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fPIE -fstack-protector-strong -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free -g -O2 -iquote /ceph/src/include -D__CEPH__ -D_FILE_OFFSET_BITS=64 -D_THREAD_SAFE -D__STDC_FORMAT_MACROS -D_GNU_SOURCE -DCEPH_LIBDIR=/usr/local/lib -DCEPH_PKGLIBDIR=/usr/local/lib/ceph -DGTEST_USE_OWN_TR1_TUPLE=0 -D_REENTRANT -fPIC -I/usr/include/python2.7 -c /ceph/src/build/rados.c -o /ceph/src/build/temp.linux-x86_64-2.7/ceph/src/build/rados.o
gcc: erreur: /usr/lib/rpm/redhat/redhat-hardened-cc1: Aucun fichier ou dossier de ce type
error: command 'gcc' failed with exit status 1

Signed-off-by: Erwan Velu <erwan@redhat.com>
2016-03-07 20:27:07 +01:00
Erwan Velu
7d48d21a53 packaging: Adding btrfs build require
When doing a 'make check', 'qa/workunits/ceph-helpers.sh' does expect the 'btrfs'
command to be available. If not, that make many tests failing.

Signed-off-by: Erwan Velu <erwan@redhat.com>
2016-03-07 20:27:06 +01:00
Sage Weil
be3544f162 Merge remote-tracking branch 'gh/jewel' 2016-03-03 13:35:13 -05:00
Nathan Cutler
9acb00ec55 ceph.spec.in: do not install Ceph RA on systemd platforms
The Ceph Resource Agent (RA) wraps the Ceph init script and is incompatible
with systemd.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-03 04:46:07 +01:00
Nathan Cutler
acfc06d949 ceph.spec.in: use %{_prefix} for ocf instead of hardcoding /usr
This patch aligns the spec file with src/ocf/Makefile.am, which
installs the resource agents in $(prefix)/lib/ocf.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-03 04:46:07 +01:00
Sage Weil
2786f0bf11 Merge remote-tracking branch 'gh/jewel' 2016-03-02 09:22:28 -05:00
Nathan Cutler
13a5aac669 RPM: move scriptlets from ceph to ceph-base
This addresses the following RPMLINT error:

ceph-base.x86_64: E: library-without-ldconfig-postun (Badness:
300) /usr/lib64/libosd_tp.so.1.0.0
ceph-base.x86_64: E: library-without-ldconfig-postun (Badness:
300) /usr/lib64/libos_tp.so.1.0.0
This package contains a library and provides no %postun scriptlet
containing a call to ldconfig.

ceph-base.x86_64: E: library-without-ldconfig-postin (Badness:
300) /usr/lib64/libosd_tp.so.1.0.0
ceph-base.x86_64: E: library-without-ldconfig-postin (Badness:
300) /usr/lib64/libos_tp.so.1.0.0
This package contains a library and provides no %post scriptlet
containing a call to ldconfig.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-01 22:27:47 +01:00
Nathan Cutler
b87f4efb56 packaging: lsb_release build and runtime dependency
The lsb_release executable is being run in multiple places, not least in
src/common/util.cc, which calls it via shell in the collect_sys_info() code
path.

This patch addresses this issue on SUSE- and Debian-derivatives, as well
as reinstating the dependency for RHEL/Fedora after it was dropped in
1560057226.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-03-01 15:14:46 +01:00
Nathan Cutler
4de86bf373 RPM: drop duplicate /var/lib/ceph/* directories
As of a recent commit, we had /var/lib/ceph/{mds,mon,osd} directories
packaged twice, once with %attr and once without. Drop the latter.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-29 17:36:57 +01:00
Nathan Cutler
275b5f28ad RPM: drop duplicate udev rules from ceph-base
The udev rules should be packaged in ceph-osd only.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-29 17:36:57 +01:00
Nathan Cutler
5083980f46 packaging: rados-classes libraries in ceph-base
Drop duplicate rados-classes libraries from ceph-osd and align the RPM
packaging with Debian by using a wildcard to package everything that
autotools puts in the rados-classes directory.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-29 17:36:39 +01:00
Mehdi Abaakouk
10f125f765 pybind: move cephfs to Cython
This change moves cephfs binding to Cython.

Closes-bug: #14818
Signed-off-by: Mehdi Abaakouk <sileht@redhat.com>
2016-02-29 10:58:52 +01:00
Nathan Cutler
cba211dfa8 packaging: pkg_resources.py runtime dependency
ceph-detect-init uses pkg_resources.py

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-27 14:59:54 +01:00
Nathan Cutler
45ede095e2 ceph.spec.in: move ceph-disk runtime dependency to ceph-osd
ceph-disk uses sgdisk, which resides in the gdisk and gptfdisk packages on
RHEL and SUSE derivatives, respectively.

ceph-disk is included in the ceph-osd package, so the sgdisk dependency
belongs there.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-27 14:59:54 +01:00
Nathan Cutler
8b04c2b4e6 ceph.spec.in: drop support for ancient SUSE versions
In Jewel, there is no reason to support anything less than openSUSE 13.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-27 14:59:54 +01:00
Nathan Cutler
1a0bb0f687 packaging: move python-flask runtime dependency to ceph-mon, radosgw
Flask is used by MON (in the Ceph REST API) and by RGW (powerdns).
Therefore, it only needs to be in the ceph-mon and ceph-radosgw packages.

Also, this commit encloses the specification of the python-flask runtime
dependency in distro-conditional blocks to account for a minor difference
in the package name between RHEL and SUSE.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-27 14:59:54 +01:00
Nathan Cutler
608dd28713 RPM: align runtime dependencies with Debian packaging
The ceph package is now a metapackage, so move all its runtime dependencies
to ceph-base as we already have done in the Debian packaging.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-27 14:59:54 +01:00
Sage Weil
aa92f9dff0 rgw: link against system openssl (instead of dlopen at runtime)
Signed-off-by: Sage Weil <sage@redhat.com>
2016-02-25 11:44:10 -08:00
Loic Dachary
fe5aff3bfd Merge pull request #7637 from SUSE/wip-14756
Refrain from versioning and packaging EC testing plugins

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2016-02-25 12:41:19 +07:00
Ali Maredia
0cbe3dea69 debian/rpm: split mon/osd/mds server packages
Split up the "ceph" package into four new packages:

  1. ceph-mon
  2. ceph-osd
  3. ceph-mds (already done on Debian)
  4. ceph-base (files shared among multiple servers)

and then:

  5. Make "ceph" into a metapackage that depends on both -mon and -osd
    (and -mds, for RPMs).

To describe the outcome of this change another way:

  For RPMs:
  - "ceph-{mon,osd,mds}" Require: ceph-base.
  - "ceph" will become a metapackage that Requires: ceph-{mon,osd,mds}.

  For DEBs:
  - "ceph-{mon,osd,mds}" will Depends: ceph-base.
  - "ceph" will become a metapackage that Depends: ceph-{mon,osd}.
  - "ceph" will continue to Recommends: ceph-mds

New users should "yum install ceph-mon" or "yum install ceph-osd" (or
"apt-get install ceph-mon", etc) in order to install the exact daemons
that they need.

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

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-02-24 16:47:34 -05:00
Nathan Cutler
b2ae384e80 RPM: refrain from packaging EC testing plugins
Since these plugins are only used in "make check", there is no
reason to package them and doing so causes RPMLINT to complain.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-20 09:42:32 +01:00
Nathan Cutler
69291f872e packaging: move ceph_common.sh and ceph-osd-prestart.sh to /usr/lib/ceph
First, it makes sense for both ceph_common.sh and ceph-osd-prestart.sh to
reside in the same directory: make it so.

Second, /usr/lib exists on both RHEL/Fedora and SLE/openSUSE, whereas
the later lacks /usr/libexec. To make this less painful, package
ceph_common.sh and ceph-osd-prestart.sh in /usr/lib/ceph.

Third, allow e.g. FreeBSD to do its own thing by using the $(libexecdir)
Autoconf variable (but set it to /usr/lib in the spec file).

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-18 12:19:14 +01:00
Mehdi Abaakouk
82869f004e Fix rpm/deb packaging
Signed-off-by: Mehdi Abaakouk <sileht@redhat.com>
2016-02-17 12:32:38 +01:00
Nathan Cutler
fe14a267c8 ceph.spec.in: declare /usr/share/ceph properly
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-15 23:48:38 +01:00
Nathan Cutler
a6cc8ea5d9 rpm: drop systemd_libexec_dir template variable
General cleanup. Actual use of the template variable was discontinued in
7c9fdf44f2.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-15 19:54:14 +01:00
Nathan Cutler
5c09a3e4e4 rpm: drop user_rgw and group_rgw template variables
These were originally used to template RGW tmpfiles.d, which was eliminated
by 8e13d89f0f

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-15 19:44:07 +01:00
Matt Benjamin
cb9cfb7291 librgw: fix rpm packaging
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-02-12 13:07:29 -05:00
Matt Benjamin
de0f86691b librgw: add debian and rpm packaging
Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
2016-02-12 13:07:24 -05:00
Boris Ranto
bcf12049fb selinux: Allow log files to be located in /var/log/radosgw
We do suggest users to put their logs in /var/log/radosgw in the
documentation at times. We should also label that directory with
ceph_var_log_t so that ceph daemons can also write there.

The commit also updates the man page for this policy. This man page is
automatically generated by

* sepolicy manpage -p . -d ceph_t

and have not been reloaded in a while. Hence, it contains few more
changes than the new radosgw directory.

Signed-off-by: Boris Ranto <branto@redhat.com>
2016-02-11 12:37:51 +01:00
Sage Weil
f22b671434 Merge remote-tracking branch 'gh/jewel' 2016-02-08 17:26:13 -05:00
Nathan Cutler
db9408bfdf ceph.spec.in: add license declaration
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-08 18:57:31 +01:00
Nathan Cutler
23ec516b0d ceph.spec.in: add copyright notice
http://tracker.ceph.com/issues/14694 Fixes: #14694

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-02-08 16:04:34 +01:00
Jason Dillaman
3c1f0973d7 Merge pull request #7108 from jdurgin/wip-rbd-mirroring
rbd-mirror: daemon skeleton

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-02-05 12:02:32 -05:00
Josh Durgin
8f0166728b packaging: add an rbd-mirror package
Depend on ceph-common for /etc/ceph. Startup scripts will be added later.

Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2016-02-04 00:10:16 -08:00
Loic Dachary
5151063fda ceph-disk: refactor into a proper python module
Signed-off-by: Loic Dachary <loic@dachary.org>
2016-02-04 14:36:37 +07:00
Loic Dachary
acd4314cf3 Merge pull request #7284 from ceph/wip-make-remove-libedit
makefile: remove libedit from libclient.la

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-01-25 13:15:48 +07:00
Gregory Farnum
f3e58a054a Merge pull request #6205 from jcsp/wip-volume-client
pybind: add ceph_volume_client interface for Manila and similar frameworks

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2016-01-19 18:21:23 -08:00
Kefu Chai
f5da159457 makefile: remove dependency on libedit
turns out we are not using it anymore

Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-01-20 00:35:50 +08:00
Ved-vampir
300c2f773b Compressor: compressor plugins unit tests
Signed-off-by: Alyona Kiseleva <akiselyova@mirantis.com>
2016-01-14 19:04:19 -05:00
Jason Dillaman
a290d34ebd Merge remote-tracking branch 'upstream/jewel' 2016-01-14 16:21:05 -05:00
Jason Dillaman
953bdfbccd deb,rpm: add valgrind to build dependencies
Provides necessary support for annotating helgrind
false-positives.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-01-13 09:54:29 -05:00
Josh Durgin
ebdb0a9c30 packaging: add build dependency on python devel package
This is required for building python modules with cython, but for some
reason is not a direct dependency (on debian only a recommends) for
the cython package itself.

Refs: #14059
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2016-01-12 11:12:30 -08:00
John Spray
9d10efbc7a pkg: add ceph_volume_client to python-cephfs
Signed-off-by: John Spray <john.spray@redhat.com>
2016-01-05 00:47:54 +00:00
Loic Dachary
99c7d9a156 Merge pull request #7030 from ceph/wip-detect-bz2-lz4
configure: detect bz2 and lz4

Reviewed-by: Loic Dachary <ldachary@redhat.com>
2016-01-04 14:39:40 +01:00
Sage Weil
f941642ce6 remove ceph_streamtest
This is an ancient obsolete test that is never used.

Signed-off-by: Sage Weil <sage@redhat.com>
2016-01-01 13:07:29 -05:00
Sage Weil
0633468874 rpm, debian: package ceph-bluefs-tool
Signed-off-by: Sage Weil <sage@redhat.com>
2016-01-01 13:07:18 -05:00
Kefu Chai
0dc0d425ff Revert "Revert "makefiles: remove bz2-dev from dependencies""
This reverts commit 35542eb6ed.
2015-12-23 01:40:54 -08:00
Sage Weil
91bf56e26b Merge remote-tracking branch 'gh/jewel' 2015-12-16 10:48:15 -05:00
Samuel Just
35542eb6ed Revert "makefiles: remove bz2-dev from dependencies" 2015-12-15 15:12:19 -08:00
Ken Dreyer
ff9712b249 Merge pull request #6692 from SUSE/wip-13860
ceph.spec.in: add BuildRequires: systemd

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-12-15 08:28:06 -07:00
Piotr Dałek
a8b5920259 makefiles: remove bz2-dev from dependencies
The only thing that uses bzip2-devel is RocksDB, and it's optional, not
requirement. Drop the bzip2-devel/libbz2-dev dependency entirely, and
let RocksDB use it only if it is already present.

Fixes: #13981
Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
2015-12-15 14:01:51 +01:00
Josh Durgin
701a6626a2 Merge pull request #6768 from marcan/cython
pybind: port the rbd bindings to Cython

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2015-12-09 15:45:17 -08:00
Loic Dachary
84ee7c3399 Merge remote-tracking branch 'ceph/jewel' 2015-12-08 09:03:55 +01:00
Sage Weil
e62954e07b deb,rpm: package buffer_fwd.h
Introduced by 206b8e2cc6.

Signed-off-by: Sage Weil <sage@redhat.com>
2015-12-06 09:24:17 -05:00
Hector Martin
8931875e3f ceph.spec: Cython is spelled python-Cython in OpenSuSE
Signed-off-by: Hector Martin <marcan@marcan.st>
2015-12-03 02:59:37 +09:00
Jason Dillaman
1786fa8aa9 Merge pull request #6657 from kylinstorage/wip-rbd-nbd
rbd-nbd: network block device (NBD) support for RBD 

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2015-12-02 10:38:54 -05:00
Hector Martin
9cca28a917 pybind: convert librbd bindings to Cython
ctypes is fundamentally incapable of providing safe callback support
(exceptions during callbacks are not handled properly). To fix this, and also
gain more flexibility, rewrite/port the librbd bindings to Cython instead.
Other Python bindings are expected to migrate to Cython in the future.

Reference: http://tracker.ceph.com/issues/13115

To support this, this change also:
- Introduces a Makefile for pybind which calls setup.py
- Updates the installation files for packages
- Adds a hack to admin/build-doc to build a dummy librbd, avoiding the need to
  build the entire client library just to generate documentation (Sphinx needs
  to be able to import rbd.so, which depends on librbd.so symbols).

With contributions by Josh Durgin <jdurgin@redhat.com>

Signed-off-by: Hector Martin <marcan@marcan.st>
2015-12-02 00:41:17 +09:00
Hector Martin
5113c962ee configure/packaging: introduce Cython dependency
To prepare for the migration of rbd.py to Cython, add Cython as a package
dependency and have the configure script look for it.

Also adds Cython as a dependency for admin/build-doc, and changes the
virtualenv to allow usage of system packages (to avoid having to compile
Cython inside the virtualenv).

With contributions by Josh Durgin <jdurgin@redhat.com>

Signed-off-by: Hector Martin <marcan@marcan.st>
2015-12-02 00:29:54 +09:00
Sage Weil
a12efa204e Merge pull request #6276 from david-z/wip-systemd-finegrain-ceph-service
systemd: start/stop/restart ceph services by daemon type

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Sage Weil  <sage@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2015-11-28 08:25:40 -05:00
Nathan Cutler
014e2f0e76 ceph.spec.in: use %tmpfiles_create macro
Ensure the macro is defined, and use it to placate the relevant openSUSE
RPMLINT check.

Drop --prefix=/run/ceph (introduced by 477bb064) because we now supply the
configuration file on the systemd-tmpfiles command line. (We don't need to run
systemd-tmpfiles on all files in /usr/lib/tmpfiles.d/ - just on ours.)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-11-26 19:04:25 +01:00
Nathan Cutler
a4924d497b ceph.spec.in: add BuildRequires: systemd
http://tracker.ceph.com/issues/13860 Fixes: #13860

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-11-24 17:20:35 +01:00
Nathan Cutler
095c29c3c4 ceph.spec.in: make --with lowmem_builder limit _smp_mflags
The limit, -j8, may seem arbitrary but works nicely in the openSUSE Build
Service.

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

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2015-11-24 15:45:40 +01:00
Yunchuan Wen
7bbd54a1e6 add rbd-nbd package
Signed-off-by: Yunchuan Wen <yunchuan.wen@kylin-cloud.com>
2015-11-21 23:26:44 +08:00
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 #6419 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: #13374
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: #13374
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
Zhi Zhang
cfa2d0a08a fine-grained control systemd to start/stop/restart ceph services at once
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
2015-10-26 15:13:19 +08: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 #5219 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 #6249 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: #13305
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 #6190 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 #6183 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: #13402

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: #13353

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 #6171 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: #13375

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: #13352

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: #13324

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: #13346

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 #6142 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: #13061
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: #13061
Signed-off-by: Boris Ranto <branto@redhat.com>
2015-10-02 12:19:07 +02:00
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