1
0
mirror of https://github.com/ceph/ceph synced 2024-12-26 13:33:57 +00:00
Commit Graph

899 Commits

Author SHA1 Message Date
Kefu Chai
4068217579 ceph.spec: use devtoolset-6-gcc-c++ on aarch64
see https://github.com/sclorg/centos-release-scl
see https://buildlogs.centos.org/centos/7/sclo/aarch64/rh/

Fixes: http://tracker.ceph.com/issues/22301
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-12-05 23:48:15 +08:00
Kefu Chai
246c27a9c5 ceph.spec: use devtoolset-7-gcc-c++ on centos/rhel
for better performance.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-12-05 10:29:48 +08:00
Kefu Chai
b3ceafe7d8 cmake,rpm,deb: update to accommodate SPDK v17.10
* cmake/modules/BuildSPDK.cmake: add lvol
* cmake/modules/BuildDPDK.cmake: add pci and bus_pci
* ceph.spec.in, cmake/modules/BuildSPDK.cmake, debian/control:
  re-introduce libuuid dependency, as 17.07 added lvol. and the latter
  depends on uuid.
* cmake/modules/BuildSPDK.cmake: avoid introducing local variable of
  `iface_libs`.
* cmake/modules/patch-dpdk-conf.sh: disable
  CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES, this option introduces the
  balanced allocation of memory. but it also requires libnuma-dev.
  let's disable it for now.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-29 18:03:23 +08:00
Kefu Chai
54b528b802
Merge pull request from smithfarm/wip-ceph-volume-spec
build/ops: rpm: fix systemd macros for ceph-volume@.service

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2017-11-24 23:49:56 +08:00
Nathan Cutler
267a14528a
Merge pull request from tchaikov/wip-rpm-cunit-for-suse
rpm: build-depends on "cunit-devel" for suse

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2017-11-24 15:08:13 +01:00
Boris Ranto
c2b98819d9
Merge pull request from badone/wip-selinux-policy-doc-rawhide-build
build/ops: rpm: selinux-policy fixes

Reviewed - by: branto@redhat.com
2017-11-23 13:54:52 +01:00
Brad Hubbard
ee4f172f98 build/ops: rpm: selinux-policy fixes
Requiring the file /usr/share/selinux/devel/policyhelp breaks fc27 and
Rawhide builds as they do not have that file. This exposed the fact this
code had not worked in some time due to changes in selinux policy
modules packaging. See
https://bugzilla.redhat.com/show_bug.cgi?id=999584

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
2017-11-22 17:02:17 +10:00
Nathan Cutler
d1f2df37dd build/ops: rpm: fix systemd macros for ceph-volume@.service
Fixes: http://tracker.ceph.com/issues/22217
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-11-21 21:41:33 +01:00
Kefu Chai
586da3da4f
Merge pull request from ddiss/pid_max
sysctl.d: set kernel.pid_max=4194304

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-11-20 14:37:08 +08:00
Kefu Chai
1ac89cb799 rpm: add cunit-devel for 'suse_version'
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-18 14:05:25 +08:00
David Disseldorp
4d0b700688 sysctl: relocate 90-ceph-osd.conf under etc/sysctl/
Signed-off-by: David Disseldorp <ddiss@suse.de>
2017-11-17 14:40:23 +01:00
Kefu Chai
22d8dde1d5 rpm,deb: add cunit1 as build dependency
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-17 15:40:00 +08:00
John Spray
1fbd3b7b9f Merge pull request from smithfarm/wip-rpm-recommend-influxdb
build/ops: rpm: recommend python-influxdb with ceph-mgr

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Tim Serong <tserong@suse.com>
2017-10-26 17:23:34 +02:00
Nathan Cutler
ca820fff95 build/ops: rpm: recommend python-influxdb with ceph-mgr
The influxdb module won't run if python-influxdb is not present (but it will be
graceful about not running). That means python-influxdb is a dependency of
that module, not mgr itself. However, we are not (yet) packaging the modules
separately. (When we do, this could become a Requires: of the module.)

RPM itself does not support "Recommends", and ignores this line. Higher-level
tools may or may not support it, so put this line in a SUSE-only conditional
since we know that zypper supports it.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
2017-10-25 09:42:47 +02:00
Kefu Chai
e90916dd77 Merge pull request from chenliuzhong/change-aio-max-nr
ceph.spec.in,debian/rules: change aio-max-nr to 1048576

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-25 13:25:24 +08:00
Kefu Chai
e479bd0ac1 rpm,debian: use download.ceph.com/tarballs instead of ceph.com/download
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-24 16:00:09 +08:00
chenliuzhong
36326dc710 ceph.spec.in,debian/rules: change aio-max-nr to 1048576
when osd is more than 14 in one host,it report error that aio is not enough.
As the default aio-max-nr is 65536, one OSD needs 4096 aios and other programs may use aios.
This patch change aio-max-nr to 1048576 when install ceph-osd rpm package and debian package

Signed-off-by: chenliuzhong <liuzhong.chen@easystack.cn>
2017-10-24 13:16:36 +08:00
Kefu Chai
21cf1eb4fd Merge pull request from liewegas/wip-bluestore-superblock
os/bluestore: allow reconstruction of osd data dir from bluestore bdev label

Reviewed-By: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-10-19 13:51:18 +08:00
Sage Weil
7b91e50dbd doc/man/8/ceph-bluestore-tool: add man page
Signed-off-by: Sage Weil <sage@redhat.com>
2017-10-16 14:29:10 -05:00
Nathan Cutler
d7b493a710 build/ops: rpm: move ceph-*-tool binaries out of ceph-test subpackage
ceph-osdomap-tool into ceph-osd subpackage
ceph-monstore-tool into ceph-mon subpackage
ceph-kvstore-tool into the ceph-base subpackage

Fixes: http://tracker.ceph.com/issues/21762
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-10-16 09:47:55 +02:00
Nathan Cutler
07159477ee Merge pull request from smithfarm/wip-21176
build/ops: python-numpy-devel build dependency for SUSE

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Ewaznazari <Nazari@keyinternational.academy>
2017-09-13 09:05:01 +02:00
Nathan Cutler
be4d6b1a74 build/ops: rpm: do not create librbd.so.1 symlink in /usr/lib64/qemu
As reported by Ademar de Souza Reis Jr <areis@redhat.com>:

This symlink should not be necessary anymore. QEMU is properly linked to
ceph/librbd these days (look at the qemu-block-rbd sub-package in Fedora and
the respective package in RHEL).

The symlink was a hack from a time when librbd was distributed and supported by
ceph and the rbd driver would be enabled at runtime only when/if the symlink
was present.

So the right fix is to actually get rid of the symlink altogether and never
touch (much less own) /usr/lib64/qemu.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-09-04 15:00:47 +02:00
Sage Weil
2d98708135 rpm,deb: package ceph-kvstore-tool man page
Signed-off-by: Sage Weil <sage@redhat.com>
2017-08-31 11:58:11 +08:00
Nathan Cutler
1586f2ca9a build/ops: python-numpy-devel build dependency for SUSE
Fixes: http://tracker.ceph.com/issues/21176
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-08-30 13:48:21 +02:00
Alfredo Deza
3ffae03df6 rpm: include ceph-volume and ceph-volume-systemd man pages
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-22 11:22:52 -04:00
Ken Dreyer
6fba9cc3f9 rpm: ceph-fuse requires fuse package
The ceph-fuse(8) man page describes using the "fusermount" tool to mount
CephFS. This utility is in the "fuse" package. Prior to this change, the
ceph-fuse RPM only depends on "fuse-libs", not "fuse".

The Debian packaging has always depended on the full "fuse" (previously
"fuse-utils") package, so we should make the RPM packaging do the same.

Fixes: http://tracker.ceph.com/issues/21057
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-08-21 13:03:38 -06:00
Ken Dreyer
5c1e9f55d3 rpm: rm macros in comments
rpm expands all macros in a .spec file, even those in comments. Drop the
percent signs so rpm will not expand these.

This change silences rpmlint's warning about macros in comments.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-08-17 12:20:01 -06:00
Sage Weil
0b5267e428 Merge pull request from liewegas/wip-20915
rpm,deb: fix ceph-volume

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2017-08-06 13:41:21 -05:00
Sage Weil
f766842fcf Merge pull request from dillaman/wip-bootstrap-rbd-mirror
mon: added bootstrap-rbd auth profile

Reviewed-by: Sage Weil <sage@redhat.com>
2017-08-05 13:27:32 -05:00
Sage Weil
ab28f7a23e ceph.spec.in: ceph_volume but not ceph_volume_client in ceph-base
Fixes: http://tracker.ceph.com/issues/20915
Signed-off-by: Sage Weil <sage@redhat.com>
2017-08-05 13:42:00 -04:00
Alfredo Deza
7e0ee3d6b5 build: include the ceph-volume-systemd command in the spec file
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-04 10:25:57 -04:00
Alfredo Deza
004e907e6b build/ops: add ceph-volume scripts/files to spec file
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-04 10:25:57 -04:00
Jason Dillaman
bedd712840 mon: new bootstrap-rbd auth profile
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2017-07-27 14:07:00 -04:00
Kefu Chai
344ed5f191 Merge pull request from ddiss/cmake_install_includedir
cmake: use CMAKE_INSTALL_INCLUDEDIR

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-07-26 23:19:05 +08:00
Sage Weil
6b2458065e deb,rpm: require socat for ceph-test
Used by qa/standalone/mon/mon-bind.sh.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-07-24 15:44:51 -04:00
David Disseldorp
f68add4f45 cmake: use CMAKE_INSTALL_INCLUDEDIR
Header files are currently installed under a hardcoded "include" path.
Use CMAKE_INSTALL_INCLUDEDIR instead, which defaults to "include" but
allows for customisation alongside other (already used) CMAKE_INSTALL_X
paths.

Signed-off-by: David Disseldorp <ddiss@suse.de>
2017-07-21 16:05:54 +02:00
Nathan Cutler
c21a9f24f4 Revert "Test-enable XIO messenger and IB/RDMA support"
This reverts commit 71cbc832de.

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

Conflicts:
	ceph.spec.in (trivial resolution)
2017-07-21 11:20:27 +02:00
Sage Weil
5f51a84054 Merge pull request from smithfarm/wip-20425
build/ops: rpm: put mgr python build dependencies in make_check bcond

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2017-07-18 08:41:00 -05:00
Nathan Cutler
758bcf9a0c build/ops: rpm: fix typo WTIH_BABELTRACE
Introduced by b331898ea9

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-07-17 14:46:57 +02:00
Nathan Cutler
0e199cef8c build/ops: rpm: socat is only needed for "make check"
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-07-17 13:13:33 +02:00
Nathan Cutler
a502a93907 build/ops: rpm: put mgr python build dependencies in make_check bcond
Fixes: http://tracker.ceph.com/issues/20425
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
2017-07-17 13:12:54 +02:00
Bassam Tabbara
a8da9fd077 test,qa/workunits: add tests for public_bind_addr
Add a set of new tests for the case when public_addr and public_bind_addr
are different for a mon. In order to test this properly I had to employ
port forwarding with socat. This helps simulate what would happen in a
environment like Kubernetes. socat is now a build dependency.

Also, moved jq_success to ceph-helpers.sh and refactored run_mon to enable
creating the mons without creating the rbd pool immediately.

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
2017-07-14 10:41:49 -07:00
Nathan Cutler
7550bde5da Merge pull request from smithfarm/wip-obsolete-libcephfs1
build/ops: rpm: obsolete libcephfs1

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2017-07-12 05:15:02 +02:00
Boris Ranto
07b2e36b77 Merge pull request from ceph/wip-base-postun
rpm: Fix undefined FIRST_ARG

Reviewed-by: Nathan Cutler <ncutler@suse.com>
2017-07-07 16:20:15 +02:00
Boris Ranto
562816914c rpm: Fix undefined FIRST_ARG
If FIRST_ARG is undefined, the rpms will show an error on upgrade
because the condition in the postun script gets broken.

This was a regression introduced by commit for issue 20077 that moved
ceph-disk unit files to ceph-base.

Fixes: http://tracker.ceph.com/issues/20077
Signed-off-by: Boris Ranto <branto@redhat.com>
2017-07-07 14:42:54 +02:00
Ken Dreyer
e7e786a72e rpm: bump epoch ahead of RHEL base
RHEL's ceph-common package is "1". Move our upstream packages' epoch
ahead of that, so that upstream will always override whatever is in
RHEL, even if it happens to have a higher NVR one day.

Fixes: http://tracker.ceph.com/issues/20508
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
2017-07-05 09:37:19 -06:00
Nathan Cutler
cfc20337fd build/ops: rpm: obsolete libcephfs1
Although under normal packaging circumstances this would probably not be done,
in Ceph there is no reasonable deployment scenario where multiple major
versions of libcephfs would need to be present at the same time.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-07-03 12:04:03 +02:00
Willem Jan Withagen
b331898ea9 CMakeLists.txt: Rewrite 2 remaning options to WITH_
All options to en/disable inclusion of libraries or other software
are of the format WITH_ so that the Cmake commaind like ahs all
WITH_* options. The WITH_=ON option will result in a HAVE_ setting
in CMAKE so that tests can use that variable.

Last "abusers" to actually follow this format.

 - HAVE_BABELTRACE

 - HAVE_ZFSLIB is fixed in 

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
2017-07-02 17:10:01 +02:00
Nathan Cutler
08b81c1500 build/ops: rpm: sane packaging of %{_docdir}/ceph directory
9164804416 introduced a build error:

ceph-common-12.1.0+git.1498286248.2fcedc7b3d-1.1.x86_64.rpm: directories not
owned by a package:
 - /usr/share/doc/packages/ceph

The %docdir directive is a way of flagging anything in that directory as being
documentation. It does not actually package the directory. And we don't need
it because we're not dumping a large number of files into this directory.
For more information, see the "Directory-related Directives" section of
http://ftp.rpm.org/max-rpm/s1-rpm-inside-files-list-directives.html

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-24 14:49:08 +02:00
Boris Ranto
4dc471ed60 restful: Introduce create-self-signed-cert command
This implements a create-self-signed-cert command for the ceph-mgr
restful interface.

It is designed so that it will try to restart the module once the cert
is created.

Signed-off-by: Boris Ranto <branto@redhat.com>
2017-06-21 12:32:49 -04:00