Commit Graph

866 Commits

Author SHA1 Message Date
Kefu Chai
344ed5f191 Merge pull request #16483 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 #15940 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 #16074 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 #16208 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 #15907

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
Sage Weil
de026f15f8 ceph.spec,debian: remove auto-generated self-signed mgr restful cert
Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-20 17:25:05 -04:00
Nathan Cutler
9164804416 build/ops: rpm: package COPYING, move conf example to ceph-common
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-15 13:30:52 +02:00
Nathan Cutler
c43bbd8df0 build/ops: drop sample.fetch_config
smithfarm: @liewegas Is src/fetch_config still needed?
liewegas: i don't think so

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-15 13:30:49 +02:00
Nathan Cutler
5cd2aa214d build/ops: rpm: one License line to rule them all
The SUSE and Fedora packaging guidelines specify that subpackages _may_ have
their own License line if it is necessary. (Hopefully it's not, because
maintaining one License line is much easier.)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-14 12:15:47 +02:00
Nathan Cutler
0f2f7d60a2 build/ops: rpm, COPYING: drop GPL 2.0 with Autoconf Exception
This license is no longer used.

Fixes: http://tracker.ceph.com/issues/20091
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-14 12:15:47 +02:00
Nathan Cutler
084678de77 build/ops: rpm: Enable ppc64le and s390x builds in SLE
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-14 12:15:47 +02:00
Nathan Cutler
e889eb07e1 build/ops: rpm: ceph.spec.in: drop redundant defattrs
The defattr(-,root,root,-) has been the default for a long time.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-14 12:15:47 +02:00
Nathan Cutler
38ee2a34d0 build/ops: rpm: add which as a build dependency, unconditionally
Although "which" is only used in the tests, we need the dependency
to be picked up by install-deps.sh.

This is a stopgap measure until we can get rid of the dependency entirely by
replacing "which" with "type -P" in the tests.

Fixes: http://tracker.ceph.com/issues/20127
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-14 12:15:47 +02:00
Sage Weil
c2e346cf12 Merge pull request #15562 from tchaikov/wip-no-assert.h
common,osdc: remove atomic_t completely

Reviewed-by: Sage Weil <sage@redhat.com>
2017-06-08 20:38:23 -05:00
Sage Weil
6bf68ce29a ceph.spec.in: add python-pecan as BuildDepends too
For install-deps.sh's benefit.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-06-08 14:29:36 -04:00
Kefu Chai
a87fa37e46 cmake,debian,rpm: remove atomic_t completely
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-08 12:21:00 +08:00
J. Eric Ivancich
b3e677ab1f osd/dmclock/testing: reorganize testing, building now optional
Modify cmake files to take advantage or re-organization of dmclock's
cmake set-up, specifically not having dmclock's cmake files call
add_test. Remove dmclock tests from being dependencies on ceph's
"test" target. Make change so dmclock tests are not built unless
WITH_TESTS and WITH_DMCLOCK_TESTS are both set. This is so openSUSE
Leap will build correctly.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2017-06-06 15:02:01 -04:00
Boris Ranto
e69086645d selinux: Install ceph-base before ceph-selinux
We need to have ceph-base installed before ceph-selinux to use ceph-disk
in %post script. The default ordering is random and so the installation
randomly failed to relabel the files.

Fixes: http://tracker.ceph.com/issues/20184
Signed-off-by: Boris Ranto <branto@redhat.com>
2017-06-05 18:49:06 +02:00
Nathan Cutler
b4560572b2 Merge pull request #15231 from smithfarm/wip-20052
build/ops: rpm: make librbd1 %post scriptlet depend on coreutils

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2017-06-05 11:38:40 +02:00
Sage Weil
554cf8394a Merge pull request #15073 from liewegas/wip-mgr-stats
mon,mgr: extricate PGmap from monitor

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
2017-06-04 13:36:01 -05:00
Nathan Cutler
28a5098796 build/ops: rpm: make librbd1 %post scriptlet depend on coreutils
Fixes: http://tracker.ceph.com/issues/20052
Signed-off-by: Giacomo Comes <comes@naic.edu>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-03 15:01:43 +02:00
Kefu Chai
4c5064e7de debian,rpm: add jq dependency to ceph-test
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-06-02 13:02:52 -04:00
Yehuda Sadeh
ea911b7f48 Merge pull request #14351 from yehudasa/wip-rgw-mdsearch
rgw: metadata search part 2

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2017-06-02 09:16:07 -07:00
Nathan Cutler
3e30232607 build/ops: rpm: move _epoch_prefix below Epoch definition
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-06-01 21:37:09 +02:00
Kefu Chai
92ebb7038e Merge pull request #15286 from smithfarm/wip-cond-epoch
build/ops: rpm: apply epoch only if %epoch macro is defined

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-06-01 19:41:41 +08:00
Sage Weil
2984e5a120 Merge pull request #14457 from ceph/wip-rest-flask
ceph-mgr: Implement new pecan-based rest api
2017-05-31 17:48:43 -05:00
Boris Ranto
6991764f3b rpm: Move ceph-disk to ceph-base
The SELinux package now requires the ceph-disk binary but that one was
part of the ceph-osd package. The ceph-disk python library is already
packaged in ceph-base so moving ceph-disk to ceph-base seems like a
reasonable next step.

Signed-off-by: Boris Ranto <branto@redhat.com>
2017-05-31 14:03:53 +02:00
Boris Ranto
1cecddf031 selinux: Do parallel relabel on package install
We can take advantage of ceph-disk fix subcommand when doing a package
install. We will keep using the differential fixfiles command otherwise.

We also need to add relabel for /usr/bin/ daemons so that we could use
this.

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

Signed-off-by: Boris Ranto <branto@redhat.com>
2017-05-31 01:35:11 +02:00
Yehuda Sadeh
ea902d18e2 rgw: package radosgw-es
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2017-05-30 13:26:59 -07:00
Yuri Weinstein
805acce791 Merge pull request #15259 from zealoussnow/wip-0524
build: remove ceph-disk-udev entirely 

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
2017-05-30 08:44:47 -07:00
Yuri Weinstein
7a2ca3323b Merge pull request #15285 from smithfarm/wip-kill-fcgi
build/ops: drop libfcgi build dependency

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-30 08:42:55 -07:00
Nathan Cutler
12625e1e92 build/ops: rpm: no rgw Beast frontend on s390x
Since the Beast frontend uses boost::context which is not supported on
s390x.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-05-29 22:47:46 +02:00
Nathan Cutler
7d81a4b710 build/ops: rpm: reverse s390 bcond conditional block
I'm not a fan of "if NOT x - then - else" blocks.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-05-29 22:47:46 +02:00
Ken Dreyer
5b40557a2c Merge pull request #15270 from ceph/wip-subman-cron-attr-tserlin
Set subman cron attributes in spec file

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2017-05-25 11:43:24 -06:00
Thomas Serlin
a9eb6ecea7 Set subman cron attributes in spec file
Fixes: http://tracker.ceph.com/issues/20074

Signed-off-by: Thomas Serlin <tserlin@redhat.com>
2017-05-25 10:16:51 -04:00
Nathan Cutler
ce5d6818e8 build/ops: rpm: apply epoch only if %epoch macro is defined
This allows SUSE to drop a maintenance-intensive downstream patch.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-05-25 15:38:05 +02:00
Nathan Cutler
69e8beede8 build/ops: drop libfcgi build dependency
Follow-up on https://github.com/ceph/ceph/pull/15070 and https://github.com/ceph/ceph/pull/15098

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-05-25 11:30:14 +02:00
Leo Zhang
06018fa791 build: remove ceph-disk-udev entirely
Signed-off-by: Leo Zhang <nguzcf@gmail.com>
2017-05-25 01:51:36 +08:00