Commit Graph

1134 Commits

Author SHA1 Message Date
Dan Mick
da20184a16 add ceph-crash service
ceph-crash runs from systemd and watches /var/lib/ceph/crash
for crashdumps, posting them to the mgrs using the mgr's
crash plugin

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2018-08-08 18:37:43 -07:00
Kefu Chai
f18ffecca3 rpm: remove fmt-devel from BuildRequires
because RHEL/CentOS 7 only offers fmt-devel 3.0.2, while seastar
requires >= 4.0.0, < 5.0.0, and on openSUSE Leap 15, we have
libfmt-devel 5.x.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-02 23:16:11 +08:00
Nathan Cutler
f0eed6d00e build/ops: rpm: fix seastar build dependencies
1. cryptopp-devel was moved to the distro-specific section by
aeb974b9139d49f13e162cd90da8a0a4b3fc3b33, then
96196e9d774ab55fabb792935a09a81cf0ca9786 reintroduced it in the
non-distro-specific section, breaking install-deps.sh for SUSE

2. fmt-devel is called libfmt-devel on SUSE

Fixes: install-deps.sh on SUSE
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-08-02 12:19:34 +02:00
Kefu Chai
d76fbf67a6
Merge pull request #23043 from tchaikov/wip-python-cephfs-dependencies
deb,rpm: fix python-cephfs dependencies

Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2018-07-28 09:53:32 +08:00
Kefu Chai
03c7bee4ee deb,rpm: python-cephfs should depend on python-ceph-argparse
python-ceph-argparse is required by ceph_volume_client.py. hence we do
need list it as a dependency of python-cephfs.

Fixes: http://tracker.ceph.com/issues/24919
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-07-25 20:53:50 +08:00
Kefu Chai
8d8099b73e rpm: Revert "build/ops: rpm: python3-ceph-argparse only if Python 2 available"
This reverts commit c0b7aab381.

python3-ceph-argparse is required by ceph_volume_client.py. hence we do
need it as a dependency of python3-cephfs.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-07-25 15:22:16 +08:00
Kefu Chai
b35823cbbc deb,rpm: python-cephfs should depend on python-rados
in `cephfs.pyx` we `cimport rados`, and in
LibCephFs.create_with_rados(), Rados.cluster is accesssed without GIL,
so we need to import the rados module for cephfs to ensure that it's
safe to access this attribute without GIL.

dh_python2 and dh_python3 cannot fill ${python:Depends} and
${python3:Depends} with this dependency, so we need to set it
explicitly.

Fixes: http://tracker.ceph.com/issues/24918
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-07-25 15:22:16 +08:00
Kefu Chai
96196e9d77 rpm,install-deps,cmake: install {c-ares,fmt}-devel
* ceph.spec.in: c-ares-devel and fmt-devel are installed as
  dependencies fo seastar.
* install-deps.sh: libfmt-dev is missing in xenial, so we only
  install libc-ares-dev for ubuntu in install-deps.sh .
* cmake: build libfmt if it's not found.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-07-25 13:13:45 +08:00
Nathan Cutler
341d985673 build/ops: rpm: provide files moved from ceph-test
d7b493a7108a68302bc0f48337bf3c253a720266 moved three binaries from the
ceph-test package to other packages, causing trouble with upgrades in
test lab environments (users typically do not install the ceph-test
package).

While the original upgrade troubles have already been addressed, RPM
has a "Provides" mechanism for easing the pain, so it makes sense to
use it.

Fixes: http://tracker.ceph.com/issues/22558
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-07-21 10:14:02 +02:00
Nathan Cutler
9b53c0d4fc
Merge pull request #23077 from smithfarm/wip-etc-sudoers
build/ops: rpm: make sudo a build dependency

Reviewed-by: Tim Serong <tserong@suse.com>
2018-07-19 16:26:20 +02:00
Nathan Cutler
9f54233104 build/ops: rpm: make sudo a build dependency
ede36df3253bd67bfe206abc0446f1f156feae64 added sudo as a runtime dependency,
but that commit also causes OBS builds to fail with:

[10666s] ... checking filelist
[10667s] ceph-osd-14.0.0-lp150.1332.1.x86_64.rpm: directories not owned by a package:
[10667s]  - /etc/sudoers.d

Since the "sudo" package is a runtime dependency of ceph-osd, it is guaranteed
to be installed on the target system and there is no reason for ceph-osd to own
this directory.

Having sudo as a build dependency makes OBS happy, and does no harm.

Follow-on fix for https://github.com/ceph/ceph/pull/22745

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-07-19 14:15:05 +02:00
Nathan Cutler
aeb974b913 build/ops: rpm: fix seastar build dependencies for SUSE
cryptopp-devel is called libcryptopp-devel on SUSE.

/usr/bin/protoc is included in protobuf-devel on SUSE.

numactl-devel is called libnuma-devel on SUSE

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-07-19 10:08:41 +02:00
Kefu Chai
25d5122b55 rpm,install-deps.sh: add --with-seastar option
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-07-12 17:49:34 +08:00
Nathan Cutler
12ef59fdb0 rpm: move make check-specific build deps to appropriate conditional block
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-07-11 13:56:49 +02:00
Nathan Cutler
3a30dd13a3 rpm: remove universal requires from distro-specific conditional blocks
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-07-11 13:51:04 +02:00
Sage Weil
884a0d24ab Merge PR #22745 into master
* refs/pull/22745/head:
	debian/control: require sudo
	ceph.spec: require sudo
	ceph.spec: install etc/sudoers.d/ceph-osd-smartctl
	debian: install etc/sudoers.d/ceph-osd-smartctl
	sudoers.d/ceph-osd-smartctl: allow user ceph to run smartctl as root

Reviewed-by: Erwan Velu <erwan@redhat.com>
2018-07-06 13:43:15 -05:00
Sage Weil
15732cdfc1 Merge PR #22871 into master
* refs/pull/22871/head:
	deb/rpm: add python-six as build-time and run-time dependency

Reviewed-by: Lenz Grimmer <lgrimmer@suse.com>
Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Sebastian Wagner <swagner@suse.com>
2018-07-06 13:42:38 -05:00
Kefu Chai
af2c91ace6 deb,rpm,do_cmake: switch to cmake3
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-07-06 13:29:21 +08:00
Sage Weil
72fcace746 ceph.spec: require sudo
Signed-off-by: Sage Weil <sage@redhat.com>
2018-07-05 16:27:55 -05:00
Kefu Chai
e53bb2c5a3 deb/rpm: add python-six as build-time and run-time dependency
python-six is used by dashboard's controllers. please note,
${python:Depends} is able to fill the installation dependencies for
debian package. so python-six is not added to Requires of ceph-mgr.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-07-05 18:42:57 +08:00
Sage Weil
ede36df325 ceph.spec: install etc/sudoers.d/ceph-osd-smartctl
Signed-off-by: Sage Weil <sage@redhat.com>
2018-06-27 15:17:42 -05:00
Kefu Chai
572a740a03
Merge pull request #20297 from tanghaodong25/rdma-cm
msg/async/rdma: add iWARP RDMA protocol support

Reviewed-by: Haomai Wang <haomai@xsky.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-06-27 20:37:48 +08:00
Kefu Chai
da5d156b6b include/memory.h: remove memory.h
memory.h was introduced back when the shared_ptrs were still in TR1, but
we've moved to C++17 now. and the C++ clients should be compiled with
a C++11 compatible compiler. so there is no need to have this file anymore.

also replace all references of ceph::shared_ptr and ceph::weak_ptr with
std::shared_ptr and std::weak_ptr accordingly.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-06-26 17:52:04 +08:00
Sage Weil
60244f2bff Merge PR #22586 into master
* refs/pull/22586/head:
	global/signal_handler: one less frame of context
	global/signal_handler: write crash dumps to /var/lib/ceph/crash/$uuid/
	common/ceph_context: add "assert" and "abort" asok commands
	common/assert: record assert info in g_assert_* globals
	common: add crash_dir option
	common/assert: get rid of duplicate log dump from assert handler
	common/BackTrace: add dump()
	log: do not discard recent after dumping it
	debian,rpm: /var/lib/ceph/crash
2018-06-22 13:00:35 -05:00
haodong tang
a240aef143 msg/async/rdma: add RDMA iWARP protocol support
Signed-off-by: Haodong Tang <haodong.tang@intel.com>
2018-06-20 14:08:20 +08:00
Sage Weil
e37e6407b9 debian,rpm: /var/lib/ceph/crash
Signed-off-by: Sage Weil <sage@redhat.com>
2018-06-15 14:39:18 -05:00
Alfredo Deza
b180b69019 rpm: remove ceph-disk ceph-detect-init python files
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-06-13 15:16:26 -04:00
Alfredo Deza
bbb9b94f37 rpm: remove ceph-osd and parttypeuuid udev rules
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-06-13 15:16:26 -04:00
Alfredo Deza
328807f80b rpm: remove ceph-disk, ceph-detect-init from spec file
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2018-06-13 15:16:22 -04:00
Kefu Chai
ea62de37fc deb,rpm: package librgw_admin_user.{h,so.*}
* install and package librgw_admin_user.h, so developers can use it to
  create rgw user.
* package librgw_admin_user, so user can use it to create rgw user.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-05-24 16:45:58 +08:00
Wido den Hollander
cf97b5c13f brag: Remove ceph-brag
To be replaced by Telemetry module in Ceph Mgr

Signed-off-by: Wido den Hollander <wido@42on.com>
(cherry picked from commit dce630dc1bce14253659e5a849a00f45fa6e4915)
2018-05-14 23:33:48 +08:00
Dan Mick
39b2626c7a Remove embedded 'cephd' code
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2018-05-11 13:10:26 -07:00
Nathan Cutler
fb5cf54c12 Revert "ceph.spec: work around build.opensuse.org"
This reverts commit 21d941e83b168fa297aed58e27b4c11193468293 which introduced a
"kludge" to make 32-bit x86 builds work in the openSUSE Build Service (OBS).

The OBS no longer uses i386 in RPM_OPT_FLAGS when the i586 build target is
specified. The current value of RPM_OPT_FLAGS for i586 is:

-fomit-frame-pointer -fmessage-length=0 -grecord-gcc-switches -O2 -Wall
-D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables
-fasynchronous-unwind-tables -fstack-clash-protection -g

(Side note: we are not currently building Ceph for any 32-bit architectures
in the OBS, and there are no plans to start doing so. That doesn't mean it
won't ever happen, but even if it does, this "kludge" will not be needed.)

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

Conflicts:
	ceph.spec.in
2018-04-28 21:31:03 +02:00
Nathan Cutler
fac2359378
Merge pull request #21356 from smithfarm/wip-23657
rpm,debian: Ensure all ceph-disk runtime dependencies are declared for ceph-base

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
2018-04-13 15:59:11 +02:00
Kefu Chai
ad79adc550
Merge pull request #21345 from ceph/fix_e2fsprogs
specs: require of e2fsprogs

Reviewed-by: Sébastien Han <seb@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Erwan Velu <erwan@redhat.com>
2018-04-13 15:51:29 +08:00
Casey Bodley
a2c8448173 rpm: add build dependency for lz4
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-04-12 09:35:40 -04:00
Nathan Cutler
acf6423cf6 build/ops: move parted runtime dependency to ceph-base
Since ceph-disk has been moved from "ceph-osd" to "ceph-base", all of
ceph-disk's dependencies should also be moved, provided they are not
needed by anything else.

Fixes: http://tracker.ceph.com/issues/23657
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-04-12 03:28:40 +02:00
Nathan Cutler
e23a12c2cb build/ops: rpm: move sgdisk-providing dep to ceph-base
In Debian "gdisk" is already listed under ceph-base, so this commit is
RPM-only.

sgdisk is only used by ceph-disk (part of "ceph-base"), not by ceph-volume
(part of "ceph-osd")

Fixes: http://tracker.ceph.com/issues/23657
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-04-11 19:44:29 +02:00
Guillaume Abrioux
a991778341 specs: require of e2fsprogs
in ceph/ceph-container we've realized that `e2fsprogs` isn't installed in
centos container image because ceph hasn't a dependency for it.
It has for consequence to fail when deploying a containerized cluster
with dmcrypt when using centos image.

Typical error encountered:

typical error:
```
......
get_dm_uuid: get_dm_uuid /dev/sda uuid path is /sys/dev/block/8:0/dm/uuid
get_dm_uuid: get_dm_uuid /dev/sda uuid path is /sys/dev/block/8:0/dm/uuid
get_dm_uuid: get_dm_uuid /dev/sda5 uuid path is /sys/dev/block/8:5/dm/uuid
populate: Creating lockbox fs on %s: mkfs -t ext4 /dev/sda5
command_check_call: Running command: /usr/sbin/mkfs -t ext4 /dev/sda5
mkfs.ext4: No such file or directory
Traceback (most recent call last):
  File "/usr/sbin/ceph-disk", line 9, in <module>
    load_entry_point('ceph-disk==1.0.0', 'console_scripts', 'ceph-disk')()
......
```

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
2018-04-11 19:22:10 +02:00
Yehuda Sadeh
ada9b94849 rgw: add distro dependencies for liboath
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2018-04-09 07:02:17 -07:00
Ricardo Dias
204109cc82
mgr/dashboard: using RoutesDispatcher as HTTP request dispatcher
Signed-off-by: Ricardo Dias <rdias@suse.com>
2018-04-04 17:41:03 +01:00
Kefu Chai
4fb21e1a18
Merge pull request #20556 from yanghonggang/master
lttng: Trace rgw data transfer, bi entry and object header update processes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2018-03-29 18:44:39 +08:00
Yang Honggang
6930e9f3ca lttng: Trace rgw data transfer, bi entry and object header update processes
Signed-off-by: Yang Honggang <joseph.yang@xtaotech.com>
2018-03-20 14:15:50 +08:00
Nathan Cutler
820dac980e
Merge pull request #20876 from smithfarm/wip-doc-license
legal: remove doc license ambiguity

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2018-03-19 14:29:54 +01:00
Ricardo Dias
aa205a6731
mgr/dashboard: renamed dashboard_v2 to dashboard
Signed-off-by: Ricardo Dias <rdias@suse.com>
2018-03-16 07:23:08 +00:00
Nathan Cutler
e294dd5910 legal: remove doc license ambiguity
The license applicable to the files under doc/ was originally declared (in the
top-level file COPYING) to be "Creative Commons Attribution-ShareAlike (CC
BY-SA)" by ed0653b493

This license declaration omitted a version number.

Some time later ef7418421b was merged, mentioning
CC-BY-SA-1.0 as one of the Ceph source code licenses. Although the purpose of that
commit was only to summarize the canonical license information from COPYING, it
unintentionally became the only place in the source code where the doc license
version was specified.

In March 2018, the Debian project warned that CC-BY-SA-1.0 does not meet its
criteria for inclusion in the "free" section of the Debian distribution. (For
that, at least version 3.0 must be used.)

This new commit removes the doc license ambiguity by setting it to CC-BY-SA-3.0
in all places where the license is mentioned.

The exact spelling of the license name is taken from https://spdx.org/licenses/

Fixes: http://tracker.ceph.com/issues/23336
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-03-13 18:59:02 +01:00
Nathan Cutler
233fe8338e
Merge pull request #17530 from smithfarm/wip-21264
tools: cleanup: rip out ceph-rest-api

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
2018-03-06 15:22:20 +01:00
Nathan Cutler
495742f7dd tools: cleanup: rip out ceph-rest-api
Obsoleted by the mgr REST API.

Fixes: http://tracker.ceph.com/issues/21264
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-03-05 22:01:51 +01:00
Sebastian Wagner
24e216b519
mgr/dashboard_v2: Add CMake target to build the frontend.
* Added new CMake flag `WITH_MGR_DASHBOARD_V2_FRONTEND`:
  Build the mgr/dashboard_v2 frontend using `npm install && npm run build`

* Set this flag to `OFF` when building packages.

* Removed creation of the frontend from `vstart.sh`

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
2018-03-05 13:07:17 +00:00
Ricardo Dias
71ac216383
ceph.spec: added dashboard_v2 development and runtime dependencies
Signed-off-by: Ricardo Dias <rdias@suse.com>
2018-03-05 13:07:14 +00:00
Volker Theile
0281b2cb88
mgr/dashboard_v2: Add command to create/update username/password.
Signed-off-by: Volker Theile <vtheile@suse.com>
2018-03-05 13:06:58 +00:00
Nathan Cutler
fba862df03
Merge pull request #20404 from smithfarm/wip-cmake-with-systemd
build/ops: change WITH_SYSTEMD default to ON

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2018-02-27 14:03:30 +01:00
Nathan Cutler
93e99e7a27
Merge pull request #20138 from smithfarm/wip-recommend-chrony
build/ops: rpm: recommend chrony instead of ntp-daemon

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2018-02-27 13:48:52 +01:00
Nathan Cutler
dba3ebec29 build/ops: change WITH_SYSTEMD default to ON
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-02-12 18:11:31 +01:00
Sage Weil
8ae0a0169f ceph_xattr_bench: drop
Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-06 08:21:29 -06:00
Sage Weil
5749434ad6 test/bench: remove smallio bench tools
These are stale and superceded by the fio ObjectStore (and other)
backends.  Shed the weight!

Signed-off-by: Sage Weil <sage@redhat.com>
2018-02-06 08:21:29 -06:00
Kefu Chai
af20ea9d5a
Merge pull request #20140 from smithfarm/wip-python3-mopup
build/ops: rpm: Python 3-only ceph-disk and ceph-volume

Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-02-02 15:35:05 +08:00
Nathan Cutler
f57e00db80 build/ops: rpm: fix _defined_if_python2_absent conditional
The expectation is that _defined_if_python2_absent will be defined
if (and only if) the python2 bcond is not set. Before this patch, if
somebody were to build the package on suse_version 1500 with
--with-python2, the _defined_if_python2_absent would be defined,
which is a bug.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-29 14:17:00 +01:00
Nathan Cutler
3d5dabf811 build/ops: rpm: Python 3-only ceph-disk and ceph-volume
This should have been part of 661ccdbaa15f88d69986533c74553e6a19bd577d
but was overlooked.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-28 01:03:51 +01:00
Nathan Cutler
46f67dd608 build/ops: rpm: recommend chrony instead of ntp-daemon
References: https://tracker.ceph.com/issues/22751
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-26 20:42:38 +01:00
Nathan Cutler
ea5ac3cdde build/ops: rpm: correct Group for python libraries
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-26 07:42:18 +01:00
Nathan Cutler
d688b23ff8 build/ops: rpm: introduce _python_buildid macro
This eliminates several ugly conditional blocks. This commit also does some
cleanup like dropping the ceph-base runtime dependency on "python", which is
implicit in "python-requests".

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-26 07:42:18 +01:00
Nathan Cutler
e9e62cbf81 build/ops: rpm: move distro-conditional make check deps
These were in the wrong section.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-26 07:42:18 +01:00
Nathan Cutler
c0b7aab381 build/ops: rpm: python3-ceph-argparse only if Python 2 available
The python3-ceph-argparse package is only necessary in environments where
Python 3 might not be available. For distros where Python 3 has become
standard with Python 2 an optional extension (instead of vice versa as
in the current status quo), the files in this package can (and should)
be included in ceph-common directly.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-26 07:42:18 +01:00
Nathan Cutler
b2d45578e7 build/ops: rpm: package byte-compiled ceph-rest-api
This is only necessary on Python 3-only systems.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-26 07:42:18 +01:00
Nathan Cutler
661ccdbaa1 build/ops: rpm: conditionalize Python 2 availability
Not all build targets have Python 2 available. Allow the build
to succeed on pure Python 3 systems.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-26 07:42:18 +01:00
Nathan Cutler
d048cb2cd8 build/ops: rpm: let ctest benefit from memory calculation
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-24 23:20:57 +01:00
Nathan Cutler
0cf627b4e3 build/ops: rpm: override %_smp_mflags if not enough memory
Sometimes the build machine has lots of processor cores and not enough
memory to successfully build Ceph on all of them at once. Calculate
how many parallel build processes we can sustain with the memory we
have and set a lower build parallelism if necessary. Never exceed
the value set by %_smp_mflags even if memory is aplenty.

Credits to Tomáš Chvátal for the original idea and implementation.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-24 23:20:56 +01:00
Nathan Cutler
353ff67780 build/ops: rpm: fix Group for rados-objclass-devel subpackage
Fixes RPMLINT warning "non-standard-group Development/Libraries"

Also, the Group: line is only needed for SUSE so put it in an appropriate
distro conditional.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-24 23:20:50 +01:00
Nathan Cutler
290d9094d6 build/ops: rpm: introduce _remote_tarball_prefix macro
With this macro, we can use a single Source0 line for all supported distros.
RH/CentOS/Fedora needs the prefix, while SUSE builds in the OBS use a local
tarball.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-24 17:16:26 +01:00
sysrich
2305bf06f8 build/ops: rpm: use %_fillupdir macro in openSUSE/SLES
Replace references to /var/adm/fillup-templates with new %_fillupdir macro

Fixes: https://bugzilla.opensuse.org/show_bug.cgi?id=1069468
Signed-off-by: Richard Brown <rbrown@suse.com>
2018-01-24 17:16:26 +01:00
Nathan Cutler
dd08d17fdf build/ops: rpm: reconstruct SUSE bconds
Disable java build completely. Enable lttng build on SLES only, and only for
certain architectures.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-24 17:16:26 +01:00
Nathan Cutler
a24afcdcd3 build/ops: rpm: rip out rcceph script
"rcceph" is a SysVinit-style command-line interface for stopping, starting,
enabling, etc. all ceph-osd and ceph-mon systemd units on a machine, in one go.

Since the same functionality is provided by ceph-{osd,mon}.target, the script
is obsolete. It is also unmaintained. Judging from the absence of recent
mentions of the script online, I guess it is no longer used.

Leaving dead code in the tree can cause confusion, especially when the code is
packaged and shipped to customers. Therefore I propose to rip it out.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-01-15 11:22:07 +01:00
Sage Weil
c4a7881876
Merge pull request #19881 from liewegas/wip-kill-crush-location
ceph-crush-location: remove

Reviewed-by: Wido den Hollander <wido@widodh.nl>
2018-01-11 15:48:29 -06:00
Kefu Chai
218df657d4
Merge pull request #19529 from thmour/master
ceph-volume: Require lvm2, move to osd package

Reviewed-by: Alfredo Deza <adeza@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2018-01-10 23:28:52 +08:00
Sage Weil
fb3220ff3e ceph-crush-location: remove
This script is pointless.  It is equivalent to the built-in default
behavior, which makes it only useful as a sample for what a location
hook's output should be.  The documentation has been updated to provide
that.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-01-09 16:38:12 -06:00
Kefu Chai
f69516e1dc
Merge pull request #19777 from tchaikov/wip-rpm-fix-upgrade
rpm: adjust ceph-{osdomap,kvstore,monstore}-tool feature move

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-By: Nathan Cutler <ncutler@suse.com>
2018-01-08 19:07:48 +08:00
Kefu Chai
b07aa210aa rpm: adjust ceph-{osdomap,kvstore,monstore}-tool feature move
this is the rpm's counterpart of debian/control changes related to the
ceph-{osdomap,kvstore,monstore}-tool feature move. see #19328 and #19356.
the commit introducing this move is 6dba25e. and

$ git describe 6dba25e
v12.2.2-8-g6dba25e39d

so the first release that have this change is 12.2.2-8. in other words,
ceph-{base,osd,mon} >= 12.2.2.8 cannot co-exist with ceph-test < 12.2.2-8
in the same system. so we let ceph-test Requires ceph-common with the
same version. and since ceph-{osd,mon} Requires ceph-base with the same
version, and ceph-base Requires ceph-common with the same version, so by
tiering ceph-test with ceph-common with the same version, we enforce
this restriction.

Fixes: http://tracker.ceph.com/issues/22558
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-01-06 20:00:54 +08:00
Casey Bodley
b589b73c70 cmake: add WITH_BOOST_CONTEXT option
adds a more specific option for this boost::context dependency, which was
previously only used by the radosgw beast frontend. see
http://tracker.ceph.com/issues/20048 for more background

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2018-01-05 14:55:23 -05:00
Kefu Chai
4fda7cc599
Merge pull request #19598 from jcsp/wip-22457
packaging: explicit jinja2 dependency for dashboard

Reviewed-by: Wido den Hollander <wido@42on.com>
2018-01-05 23:15:04 +08:00
Kefu Chai
85a1fa68ab ceph.spec.in: use DTS-7 on aarch64 also
see https://bugs.centos.org/view.php?id=14078

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-12-30 23:20:07 +08:00
Theofilos Mouratidis
02bc369e05 ceph-volume: Require lvm2, move to osd package
Fixes: http://tracker.ceph.com/issues/22443

Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
2017-12-25 16:52:07 +01:00
John Spray
87399bea83 packaging: explicit jinja2 dependency for dashboard
We were getting this via python-flask, when mgr was
installed on nodes with ceph-mon, but for correctness
in general we should depend on it from ceph-mgr (it
is imported by the dashboard module).

Fixes: http://tracker.ceph.com/issues/22457
Signed-off-by: John Spray <john.spray@redhat.com>
2017-12-19 11:52:29 +00:00
Nathan Cutler
37e4bc3141 build/ops: rpm: set permissions 0755 on rbd resource agent
Fixes: http://tracker.ceph.com/issues/22362
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-12-13 18:15:27 +01:00
Kefu Chai
b38621f302 ceph.spec: use dts-7 on rhel
devtoolset-7 is available for RHEL, but not for centos. only dts-6 is
available for centos.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-12-09 11:18:27 +08:00
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 #19081 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 #18997 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 #19026 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 #18544 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 #18511 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 #17894 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 #18256 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 #17366 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 #16832 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 #16633 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 #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
Nathan Cutler
08bc5e6528 build/ops: rpm: move python-prettytable to distro-conditional section
The correct package name in SUSE is python-PrettyTable

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-05-23 02:15:27 +02:00
Boris Ranto
92fa210aaa restful: Generate cert/key in post scripts
This is the simplest way to generate the keys and probably the least
likely to cause trouble in the future.

Signed-off-by: Boris Ranto <branto@redhat.com>
2017-05-22 19:21:23 +02:00
Boris Ranto
f59e9bf0bb restful: Use fixed cert/pkey files
This allows users to create their own certificates that are signed by a
CA. If the keys are not present then a self-signed certificate will be
created and distributed amongst all the mgr nodes.

It also allows us to get rid of the pyOpenSSL dependency.

Signed-off-by: Boris Ranto <branto@redhat.com>
2017-05-22 19:20:37 +02:00
Boris Ranto
5ed2631b09 ceph-mgr: Implement new pecan-based rest api
The new rest API uses pecan for the restful functionality and simplifies
the code significantly. It should be mostly equivalent in functionality
to the django-based rest API. The api is self-documenting via /doc
endpoint.

Signed-off-by: Boris Ranto <branto@redhat.com>
2017-05-22 19:18:58 +02:00
Nathan Cutler
ba641b5160 build/ops: rpm: move RDMA build dependency to distro-conditional section
SUSE ships this package under the name "rdma-core-devel". See
https://build.opensuse.org/package/view_file/openSUSE:Factory/rdma-core/rdma-core.spec?expand=1

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-05-22 14:52:26 +02:00
Dan Mick
bd6f2d9210 ceph.spec.in, debian/control: build/runtime dependency for cherrypy
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-05-18 22:09:08 -07:00
Leo Zhang
5356f2a8b9 build: move bash_completion.d/ceph to ceph-common
When only ceph-common is installed, can also use ceph completion

Signed-off-by: Leo Zhang <nguzcf@gmail.com>
2017-05-18 14:18:10 +08:00
Adam C. Emerson
69a5eebd8a rgw: Add basic support for IAM policies
This support is currently incomplete but should provide a starting
point.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
2017-05-17 14:22:18 -04:00
Kefu Chai
05e2528b92 Merge pull request #14940 from ceph/wip-radosgw-admin-package-move
debian/rpm: move radosgw-admin to ceph-common

Reviewed-by: Boris Ranto <branto@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-12 19:06:09 +08:00
Nathan Cutler
0688f57d1c build/ops: rpm: fix python-Sphinx package name for SUSE
This commit moves "BuildRequires: python-sphinx" down to the RH/CentOS/Fedora
distro conditional and adds a "BuildRequires: python-Sphinx" to the SUSE
conditional.

Signed-off-by: Jan Matejek <jmatejek@suse.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-05-09 11:42:58 +02:00
Sage Weil
7f72100be5 Merge pull request #14793 from dmick/wip-prio-and-daemonperf
ceph: perfcounter priorities and daemonperf updates to use them
2017-05-05 17:41:55 -05:00
Ali Maredia
9fd30b93f7 debian/rpm: move radosgw-admin to ceph-common
This commit moves the radosgw-admin command from
the radosgw package to ceph-common.

This allows for a better user expierence since the
radosgw-admin command can be run on any node.

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

Signed-off-by: Ali Maredia <amaredia@redhat.com>
2017-05-03 14:28:17 -04:00
Yuri Weinstein
1cce4c7f68 Merge pull request #14723 from neha-ojha/objclass-sdk
osd: objclass sdk

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-05-03 09:28:59 -07:00
Yuri Weinstein
f7cf9d14b8 Merge pull request #14870 from smithfarm/wip-gperftools
build/ops: rpm: gperftools-devel >= 2.4

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2017-05-02 08:23:59 -07:00
J. Eric Ivancich
e80a884c3c Modify ceph cmake files to bring in dmclock library and tests. Include
dmclock tests in ceph-test for builds.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
2017-04-28 17:13:56 -04:00
Nathan Cutler
295f56a94c build/ops: rpm: gperftools-devel >= 2.4
There be dragons in older versions . . .

References: http://tracker.ceph.com/issues/13522
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-04-28 11:34:31 +02:00
Dan Mick
9e3d7d9fc1 ceph.spec.in, debian/control: add dep for python-prettytable
mgr/pybind/fsstatus already required this, but ceph.in does now.
Add as a build dependency as well to handle tests.

Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-04-27 17:01:14 -07:00
Neha Ojha
b7215b025a objclass-sdk: create SDK for Ceph object classes
Creates an installable version of "src/include/rados/objclass.h" that allows
object classes to be built outside of the Ceph tree. cls_sdk is an example
of such an object class.

Signed-off-by: Neha Ojha <nojha@redhat.com>
2017-04-27 13:05:53 -07:00
huanwen ren
09f32b1ff7 mgr: mkdir bootstrap-mgr
ceph-deploy rely on bootstrap-mgr 
as follows: https://github.com/ceph/ceph-deploy/blob/master/ceph_deploy/mgr.py#L37

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
2017-04-27 16:21:02 +08:00
Nathan Cutler
4b79ac9a72 build/ops: rpm: package crypto on x86_64 only
ca40e12845e78e507a0c3f45efa1689979029874 added the following lines to the spec
file:

%dir %{_libdir}/ceph/crypto
%{_libdir}/ceph/crypto/libceph_*.so*

and 350932979b377b292edd12dc8c612945cd793e7a made it so those build artifacts
are generated on x86_64 only.

The result is a build failure on non-x86_64 architectures:

error: Directory not found: /home/abuild/rpmbuild/BUILDROOT/ceph-12.0.2+git.1493119152.181baf6-1.1.ppc64le/usr/lib64/ceph/crypto
error: File not found by glob: /home/abuild/rpmbuild/BUILDROOT/ceph-12.0.2+git.1493119152.181baf6-1.1.ppc64le/usr/lib64/ceph/crypto/libceph_*.so*

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-04-25 16:47:36 +02:00
Casey Bodley
ca40e12845 ceph.spec: add crypto plugins
Signed-off-by: Casey Bodley <cbodley@redhat.com>
2017-04-05 18:31:17 +02:00
Sage Weil
c618d22d25 Merge pull request #14258 from liewegas/wip-bluestore-tool
ceph-bluestore-tool: rename from bluefs-tool; improve usage
2017-04-05 08:55:36 -05:00
vasukulkarni
b6895fbe0e Merge pull request #14226 from ceph/preset-mon
systemd: remove ceph-create-keys from presets
2017-03-31 09:15:21 -07:00
Sage Weil
973c01d715 os/bluestore: rename ceph-bluefs-tool -> ceph-bluestore-tool
This will do bluestore-y things, not *just* bluefs things.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-03-30 15:18:31 -04:00
Sébastien Han
205cff12b3 systemd: remove all occurence of ceph-create-keys
ceph-create-keys unit file does not exist anymore so there is no need to
call it.

Signed-off-by: Sébastien Han <seb@redhat.com>
2017-03-30 09:32:31 +02:00
Sébastien Han
151c0ce213 systemd: remove ceph-create-keys from presets
ceph-create-keys unit file was removed here:

* 8bcb4646b6
* dc5fe8d415

As a consequence the systemctl preset command now fails to run since the
unit does not exist anymore. Due to the redirection in /dev/null we
don't know what's happening.

Ultimately the mon unit doesn't get enabled and the mon service won't
start after reboot.
Removing the old/non-existent unit makes the command succeed now.

Signed-off-by: Sébastien Han <seb@redhat.com>
2017-03-29 15:47:56 +02:00
Dan Mick
e7485da1fa ceph.spec.in: derive _smp_ncpus and use it for -DBOOST_J
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-03-24 10:53:52 -07:00
Dan Mick
1524daab38 ceph.spec.in: move lowmem_build setting of _smp_mflags
Signed-off-by: Dan Mick <dan.mick@redhat.com>
2017-03-24 10:53:52 -07:00
Nathan Cutler
af9f92ca69 build/ops: extend rpm spec file copyright period to 2017
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-03-10 16:17:11 +01:00
Nathan Cutler
b679b1dee3 build/ops: make package groups comply with openSUSE guidelines
. . . and put all Group: lines in SUSE conditional blocks.

Fixes: http://tracker.ceph.com/issues/19184
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2017-03-10 16:17:11 +01:00
DanielBar-On
0aeabb2b51 msg/async/rdma: compile with rdma as default
Issue: 992583
Issue: 992580

Change-Id: I24128b87294d3083c44c934f7d4bed554dd1f8a4
Signed-off-by: DanielBar-On <danielbo@mellanox.com>
2017-03-09 14:20:36 +02:00
Sage Weil
faf9cce395 Merge pull request #13744 from smithfarm/wip-19129
build/ops: add psmisc dependency to ceph-base (deb and rpm)

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-03-02 16:39:46 -06:00