Commit Graph

817 Commits

Author SHA1 Message Date
Owen Synge
c2dd25f2f9 ceph.spec.in:Remove ceph-create-keys for systemd
ceph-create-keys should not be started on boot of mons with systemd so should
not exist in the rpm.

Signed-off-by: Owen Synge <osynge@suse.com>
2016-11-04 23:04:40 +01:00
Sage Weil
1014850996 Merge pull request #10707 from SUSE/wip-fix-suse-usermod
rpm: Remove trailing whitespace in usermod command (SUSE)

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-11-03 11:29:02 -05:00
Josh Durgin
ac1c1f6f0e librados-dev: install inline_memory.h
This is needed to compile against the c++ api since
c38869232c

Fixes: http://tracker.ceph.com/issues/17654
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
2016-11-01 15:15:38 -07:00
Yuri Weinstein
a7dae73800 Merge pull request #11365 from badone/wip-lsb_release-remove
common: Remove the runtime dependency on lsb_release

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer (Red Hat) <kdreyer@redhat.com>
2016-10-31 15:29:25 -07:00
Jeff Layton
939f5bd1c2 rpm: libcephfs1 -> libcephfs2 package rename
Signed-off-by: Jeff Layton <jlayton@redhat.com>
2016-10-25 13:06:29 -04:00
Brad Hubbard
8b1a57fd34 common: Remove the runtime dependency on lsb_release
With modern releases we should be able to make do with the call to
os_release_parse only which uses /etc/os-release which should be available on
most (all?) releases we currently support. this then allows us to remove the
runtime dependency which pulls in several other packages and would be nice to
avoid.

Fixes: http://tracker.ceph.com/issues/17425
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2016-10-07 14:54:06 +10:00
Sage Weil
3447601ac3 ceph.spec: fix ceph-mgr version requirement
Signed-off-by: Sage Weil <sage@redhat.com>
2016-09-30 18:13:50 -04:00
Tim Serong
2e9e21eb42 ceph.spec.in: add ceph-mgr package
This adds ceph-mgr following the same pattern used for ceph-mon,
ceph-mds, ceph-osd.  I've removed the boost-python BuildRequire
for SUSE distros, because we don't ship that (the relevant bits
are already included in boost-devel).

NOTE: This gives an installable ceph-mgr, but not necessarily a
runnable ceph-mgr.  This is because ceph-mgr needs the following
python packages:

- CherryPy
- Django
- gevent
- python-dateutil
- djangorestframework

Not all of these are available as distro packages.  For example,
on openSUSE Tumbleweed, we don't have djangorestframework available
in the base distro, and our Django version is 1.9, which seems to
be incompatible with ceph-mgr.  I'm not sure of the situation on
other distros.

Signed-off-by: Tim Serong <tserong@suse.com>
2016-09-29 17:27:08 +01:00
John Spray
88977572f9 packaging: add boost-python dependency
Although ceph-mgr isn't packaged yet, builders
use these files to cue installation of dependencies.

Signed-off-by: John Spray <john.spray@redhat.com>
2016-09-29 17:27:05 +01:00
Ken Dreyer
d4b84a1396 rpm: fix permissions for /etc/ceph/rbdmap
Prior to this change, the RPM packaging would install /etc/ceph/rbdmap
with exectuable permissions. The execute bit is not necessary and does
not match what the Debian packaging does. Remove the execute bit in this
case.

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

Reported-by: Martin Bukatovic <mbukatov@redhat.com>
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2016-09-23 14:52:16 -06:00
Brad Hubbard
7e71cd2c81 Remove dependency on sdparm/hdparm
The code requiring a dependency on hdparm has been removed so we can remove it
as a dependency.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2016-09-14 21:33:36 +10:00
Ricardo Dias
0f347b82ef
rpm: Added ceph_test_package bcond flag to control the build of ceph-test package
Fixes: http://tracker.ceph.com/issues/16776

Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-09-09 14:12:44 +01:00
Ricardo Dias
06875b5099
rpm: Renamed bcond tests flag to make_check
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-09-09 12:55:06 +01:00
Ricardo Dias
aaa75aeb2f
rpm: Moved ceph-client-debug from ceph-base to ceph-test package
Signed-off-by: Ricardo Dias <rdias@suse.com>
2016-09-09 12:55:06 +01:00
Kefu Chai
1b163c802c Merge pull request #11015 from tchaikov/wip-optional-py3
cmake: make py3 a nice-to-have

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-09-09 10:55:24 +08:00
Kefu Chai
7d7a984846 cmake: make py3 a nice-to-have
python3 is not a hard requirement to build ceph, so make it optional.
add an option named "WITH_PYTHON3" which accepts ON, OFF, or CHECK.

Fixes: http://tracker.ceph.com/issues/17103
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-09-08 21:49:45 +08:00
Sage Weil
fba798dcad remove autotools
Signed-off-by: Sage Weil <sage@redhat.com>
2016-09-07 11:50:14 -04:00
jtlayton
0358fc095c Merge pull request #10922 from ceph/wip-jlayton-statx
First pile of statx patches
2016-09-06 07:04:51 -04:00
Sage Weil
990a920206 Merge pull request #10404 from ilc/build_fix
make-dist/ceph.spec.in: Fix srpm build breakage.

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2016-08-31 16:19:40 -05:00
Jeff Layton
f7c885e1f9 libcephfs: add a ceph_ll_getattrx and ceph_statx
New interfaces for fetching extended (and selective) stat information.
Additionally, applications can specify AT_NO_ATTR_SYNC in the flags to
indicate that they want to do a "lazy" statx that just hands out the
inode info from the cache, or AT_SYMLINK_NOFOLLOW to avoid following
symlinks when walking the path.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
2016-08-29 07:16:38 -04:00
Nathan Cutler
a497a53737 rpm: force creation of Python 3 __pycache__ on SUSE
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Dominique Leuenberger <dimstar@opensuse.org>
2016-08-26 14:22:09 +02:00
Nathan Cutler
8f7811551b Revert "ceph.spec.in: don't try to package __pycache__ for SUSE"
This reverts commit be39d6dc71.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-26 14:22:09 +02:00
Ken Dreyer
b0f9aaf852 Merge pull request #9757 from SUSE/wip-16353
rpm: drop obsolete libs-compat and python-ceph-compat metapackages

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2016-08-25 15:05:48 -06:00
Ken Dreyer
0f001697b1 Merge pull request #10805 from SUSE/wip-dont-package-__pycache__
ceph.spec.in: don't try to package __pycache__ for SUSE

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Dirk Mueller <dmueller@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2016-08-25 14:04:54 -06:00
Tim Serong
be39d6dc71 ceph.spec.in: don't try to package __pycache__ for SUSE
When building on openSUSE Tumbleweed, nothing seems to create
the various __pycache__ directories (so the build fails because
those files don't exist), and in any case they should be
created automatically at runtime, so shouldn't need to be
packaged.  However, the Fedora packaging guidelines suggest
including __pycache__, so I've used a %suse_version guard here.

Fixes: http://tracker.ceph.com/issues/17106
Signed-off-by: Tim Serong <tserong@suse.com>
2016-08-24 19:09:14 +10:00
Ira Cooper
d073076dfe make-dist/ceph.spec.in: Fix srpm build breakage.
This allows the make-dist script to create a .spec file that
can actually use the tarball created to build srpms.

Tested on Fedora 24, using mock.

Signed-off-by: Ira Cooper <ira@redhat.com>
2016-08-23 15:11:47 -04:00
Nathan Cutler
ddae82bcd4 rpm: do not unnecessarily spawn shells for scriptlets
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-23 08:44:40 +02:00
Nathan Cutler
231b7bad33 ceph.spec.in: drop trouble-making divider comments
We have some %post scriptlets that fire up a shell just to execute a single
command like this:

%postun -n librados2
/sbin/ldconfig

Normally, it would be possible to optimize these as:

%postun -n librados2 -p /sbin/ldconfig

Except that, due to an RPM bug, there must not be *any* content (not even comments)
between the %postun and the next section.

See https://bugzilla.redhat.com/show_bug.cgi?id=1003962#c0 for details.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-23 08:44:35 +02:00
Nathan Cutler
644650f59d rpm: drop obsolete libs-compat metapackage
Fixes: http://tracker.ceph.com/issues/16353
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-23 08:43:44 +02:00
Nathan Cutler
be6f6cbd5c Merge pull request #10608 from SUSE/wip-16949
rpm: add udev BuildRequires to provide /usr/lib/udev directory

Reviewed-by: Boris Ranto <branto@redhat.com>
2016-08-22 17:47:48 +02:00
David Galloway
ecd02bf3f1 ceph-post-file: migrate to RSA SSH keys
DSA keys are being deprecated: http://www.openssh.com/legacy.html

drop.ceph.com will continue to allow the old DSA key but eventually,
users submitting logs using ceph-post-file will run into issues when
OpenSSH completely drops support for the algorithm.

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

Signed-off-by: David Galloway <dgallowa@redhat.com>
2016-08-22 10:27:36 -04:00
Nathan Cutler
fc7e398f1b Merge pull request #10592 from michelmno/forpull
LTTng-UST disabled for openSUSE

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2016-08-19 17:36:58 +02:00
Tim Serong
8e1b308849 rpm: Remove trailing whitespace in usermod command (SUSE)
Trailing whitespace after the backslash on the -d line of the
usermod command effectively splits it in two, breaking the
rpm %pre script for SUSE builds.

Signed-off-by: Tim Serong <tserong@suse.com>
2016-08-12 21:30:53 +10:00
Oleh Prypin
7304268465 rpm: Add packages for Python 3 bindings
Signed-off-by: Oleh Prypin <oleh@pryp.in>
2016-08-11 16:36:57 +03:00
Michel Normand
7da19b6db7 LTTng-UST disabled for openSUSE
LTTng-UST not yet supported in openSUSE so do not enable lltng for it.
The (1) is where is defined "is_opensuse"

Remove value for test of suse_version in spec file
and change related comment from SLES12 to SLE
as per comment in https://github.com/ceph/ceph/pull/10592

(1) https://en.opensuse.org/openSUSE:Build_Service_cross_distribution_howto#Detect_a_distribution_flavor_for_special_code

Fixes: http://tracker.ceph.com/issues/16937
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
2016-08-11 10:38:06 +02:00
Nathan Cutler
1a164bc94d rpm: proper packaging of udev directories
The issue here is that ceph.spec.in does not package the directories
/usr/lib/udev and /usr/lib/udev/rules.d. The problem was not showing because
hdparm, which is brought in as a build dependency, packages these directories.
However, in SUSE a recent update to hdparm changes that and the problem
manifests.

This PR addresses the issue by adding udev as a build dependency, which should
cover /usr/lib/udev, and by adding explicit "%dir %{_udevrulesdir}" to the
packages that put files in this directory.

Fixes: http://tracker.ceph.com/issues/16949
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-09 23:00:28 +02:00
Nathan Cutler
1ab77924df Merge pull request #9744 from SUSE/wip-16345
rpm: fix shared library devel package names and dependencies

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2016-08-09 11:18:24 +02:00
Michel Normand
a8db0f4d96 ExclusiveArch for suse_version
for SLES supports only x86_64 and aarch64 targets
for openSUSE (Tumbleweed and Leap) add ppc64/ppc64le targets.

fixes: http://tracker.ceph.com/issues/16936
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
2016-08-05 16:34:48 +02:00
Nathan Cutler
64b03dcf8d rpm: provide -devel library packages that are being obsoleted
This patch ensures that packages with the new name properly
replace old-named packages on upgrades.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-03 12:30:49 +02:00
Nathan Cutler
33b67ee6a0 rpm: drop obsolete devel-compat meta package
Everyone should upgrade through Firefly -> Hammer -> etc to pick up the newer
package names.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2016-08-03 12:30:49 +02:00
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