Commit Graph

1050 Commits

Author SHA1 Message Date
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
Sage Weil
4e05cc748b "Correct" license from LGPL2 to LGPL2.1
Back in commit 7469f26a33 when the COPYING
file was added to the repository and the project was "licensed," the
license file was

                     GNU LESSER GENERAL PUBLIC LICENSE
                          Version 2.1, February 1999

However, the license was abbreviated as LGPL2 in various places (pretty
much everywhere, actually), due to my own ignorance/carelessness.  (I was
distinguishing it from shiny new version 3, released 6 months earlier.)

Version 2 of LGPL is the "Library General Public License," published in
June 1991: https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html

Note that this ambiguity persists for most of the project's lifetime.  For
example, the original debian/copyright in 8adc9dac1d
said "LGPL2" bug in 4545f8b929 (2009, a year
later) it is changed to LGPL2.1 to satisfy Debian's lintian checks.  (It's
remained LGPL2.1 ever since.)

"Correct" the record by changing LGPL2 references to LGPL2.1.

Signed-off-by: Sage Weil <sage@redhat.com>
2018-03-13 16:07:50 -05: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
b7e638f7e4 build/ops: deb: move python-jinja2 dependency to mgr
87399bea83 introduced an explicit dependency on
python-jinja2, but mistakenly as an overall build dependency instead of as a
runtime dependency of ceph-mgr as intended.

Fixes: http://tracker.ceph.com/issues/22457
Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-03-05 22:04:34 +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
57f270921f
debian/control: add dashboard_v2 development 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
Yuri Weinstein
9ed013a82f
Merge pull request #20635 from mdw-at-linuxbox/wip-master-rgw-openssl
rgw: curl* reuse and for debian, use openssl not gnutls.

Reviewed-by: Abhishek Lekshmanan <abhishek.lekshmanan@gmail.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Mark Kogan <mkogan@redhat.com>
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2018-03-02 08:21:22 -08:00
Marcus Watts
cb12e1afd5 build/link against curl w/ openssl not nss or gnutls. (debian)
curl + gnutls has some big significant performance hits at least
when doing keystone validation.  nss has long-term memory growth
issues.

Signed-off-by: Marcus Watts <mwatts@redhat.com>
2018-02-28 00:23:55 -05:00
Kefu Chai
4865831b91 cmake,deb: set EnvironmentFile using cmake
this change also fix the EnvironmentFile specified in rbdmap.service.
without this change EnvironmentFile in rbdmap.service is always
/etc/sysconfig/ceph even on debian derived distros. after this change,
this variable is /etc/default/ceph in rbdmap.service shipped by the deb
packages.

Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-02-28 00:23:48 +08:00
Kefu Chai
50707e7d62 debian: install system units using cmake
Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-02-28 00:23:22 +08:00
Nathan Cutler
b4803aa89d build/ops: deb: build with -DWITH_SYSTEMD=OFF
The Debian build assumes that "make install" will not install
the systemd unit files.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
2018-02-12 21:12:54 +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
1f21f2f3a3
Merge pull request #19870 from liewegas/wip-strip-ceph-base
debian/rules: strip ceph-base libraries

Reviewed-By: Kefu Chai <kchai@redhat.com>
2018-01-15 11:24:08 +08: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
Sage Weil
b5bd43323f debian: add -dbg packages for python-{rados,rgw,rbd,cephfs}
Signed-off-by: Sage Weil <sage@redhat.com>
2018-01-09 10:53:01 -06:00
Sage Weil
c3a7895178 debian/rules: strip ceph-base libraries
This includes rados classes and ec plugins.

Fixes: http://tracker.ceph.com/issues/22640
Signed-off-by: Sage Weil <sage@redhat.com>
2018-01-09 08:39:24 -06: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
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
Kefu Chai
809a0ce816 debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move
this is a follow-up of #19328. we need to get this change into 12.2.3.
so better off do the switch somewhere after 12.2.2 which has been
tagged, and before 12.2.3, which is not tagged yet.

please note, this is not targetting master, because i want to make
sure the change number (the <num> in << 12.2.2-<num>) is correct. it
does not hurt if it's not, as long as it is ">> 12.2.2", so the replace
machinery in 12.2.3 works, and it covers the releases where the
ceph-{osdomap,kvstore,monstore}-tool are not move yet. but why don't
make it more right?

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit cdf49ba664)
2017-12-08 14:51:08 +08:00
Sage Weil
9271d52851 debian/control: adjust ceph-{osdomap,kvstore,monstore}-tool feature move
The backport didn't make 12.2.2, but it will be in 12.2.3.

Fixes: http://tracker.ceph.com/issues/22319
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit e0c814266f)
2017-12-08 14:51:08 +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
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
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
Kefu Chai
c8d4005558 cmake,deb: remove the last trace of atomic_ops
Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-11-03 16:23:42 +08: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
Alfredo Deza
72dba6c716 Merge pull request #18480 from tchaikov/wip-doc-cleanup
doc: various cleanups

Reviewed-by: Alfredo Deza <adeza@redhat.com>
2017-10-24 07:03:29 -04: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
ed988fc660 debian: fix package relationships after d3ac8d18
d3ac8d18 moves ceph-client-debug from ceph-test to ceph-base without
updating the package relationships between the two involved packages.
which results in:

dpkg: error processing archive /var/cache/apt/archives/ceph-test_12.2.1-241-g43e027b-1trusty_amd64.deb (--unpack):
 trying to overwrite '/usr/bin/ceph-client-debug', which is also in package ceph-base 10.2.10-14-gcbaddae-1trusty
dpkg-deb: error: subprocess paste was killed by signal (Broken pipe)

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-23 20:18:15 +08:00
Kefu Chai
50dad805d9 debian: fix package relationships after 40caf6a6
we have issues when running upgrade tests:

dpkg: error processing archive /var/cache/apt/archives/ceph-osd_13.0.0-2201-g6cc0b41-1trusty_amd64.deb (--unpack):
trying to overwrite '/usr/bin/ceph-osdomap-tool', which is also in package ceph-test 10.2.10-14-gcbaddae-1trusty

in 40caf6a6, we moves some tools from ceph-test out into ceph-osd,
ceph-mon and ceph-base respectively. but didn't update the relationships
between these packages accordingly. this causes the upgrade failure.

see https://www.debian.org/doc/debian-policy/#document-ch-relationships
for more details on "Breaks" and "Conflicts".

the reason why the package version to be replaced/conflicted is 12.2.2
is that: i assume that this change will be backported to luminous, and
the next release of it will be 12.2.2 .

Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-10-23 20:18:14 +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
40caf6a6d8 build/ops: deb: 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 17:39:14 +02:00
Sage Weil
c3a53010af debian/rules: no more ChangeLog
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-28 14:33:15 -04: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
Alfredo Deza
a20015636c debian: include ceph-volume and ceph-volume-systemd man pages
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-22 11:20:47 -04:00
Alfredo Deza
60eb0e58d9 Merge pull request #17097 from ceph/wip-bz1478599
ceph-volume: Use a delimited CLI output parser instead of JSON

Reviewed-by: Andrew Schoen <aschoen@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
2017-08-21 16:52:10 -04:00
Alfredo Deza
05493ebaab debian: include ceph-volume-systemd CLI tool
Signed-off-by: Alfredo Deza <adeza@redhat.com>
2017-08-21 13:02:33 -04:00
Kefu Chai
257718556f Merge pull request #15118 from squidboylan/fix_15872
debian: lock ceph user during purge

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-08-20 10:16:43 +08: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