Commit Graph

152 Commits

Author SHA1 Message Date
Dan Mick
ee0913c2e6 Merge remote-tracking branch 'origin/master' into wip-ceph-cli
Conflicts:
	src/mon/OSDMonitor.cc
	src/osd/OSD.cc
	src/osd/ReplicatedPG.cc
2013-06-04 13:12:08 -07:00
James Page
e634d9d6b6 Use new fuse package instead of fuse-utils
The fuse-utils package was deprecated a while ago.

Switch the primary dependency for fuse tools to use
the preferred 'fuse' package.

Signed-off-by: James Page <james.page@ubuntu.com>
2013-05-29 10:57:17 +01:00
Dan Mick
70a96973e9 packaging fixes around the new ceph cli:
Remove ceph-legacy-cli
Include ceph in proper places to get it built/installed/packaged
Make ceph-common (deb) or ceph (rpm) pkg depend on python-ceph pkg

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-05-21 20:33:23 -07:00
Sage Weil
604c83ff18 debian: make radosgw require matching version of librados2
...indirectly via ceph-common.  We get bad behavior when they diverge, I
think because of libcommon.la being linked both statically and dynamically.

Fixes: #4997
Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
2013-05-16 13:17:45 -07:00
Gary Lowell
83bbae415d debian/control: squeeze requres cryptsetup package
Squeeze requires the cryptsetup package which has been renamed
cryptsetup-bin in later versions.  Allow either package to
satisfy the dependency.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-05-08 16:33:05 -07:00
Gary Lowell
7ad63d23d7 ceph-disk: OSD hotplug fixes for Centos
Two fixes for Centos 6.3 and other systems with udev versions
prior to 172.  The disk peristant name using the GPT UUID does
not exist, so use the by_path persistent name instead for the
journal symlink.

The gpt label fields are not available for use in udev rules. Add
ceph-disk-udev wrapper script that extracts the partition
type guid from the label and calls ceph-disk-activate if it is
a ceph guid type. (Bug #4632)

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-04-22 22:30:39 -07:00
Gary Lowell
7e4f80b12e debian/control: Fix typo in libboost version number
Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-04-18 10:41:38 -07:00
Gary Lowell
f4bc760776 build: Add new package dependencies
Add libboost-system-dev (bug #4725).

Add hdparm to rpm installation requirements.  The hdparm
command is used to determin if write-caching is enabled on
the journal device.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-04-18 10:41:20 -07:00
Andras Elso
2da57d7675 debian: Add git to Build-Depends (need by check_version script)
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-03-29 13:34:54 +01:00
Andras Elso
8f5c665744 debian: Run wrap-and-sort from devscripts
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-03-29 13:34:48 +01:00
Sage Weil
632f7200bb Merge branch 'next'
Conflicts:
	src/mon/AuthMonitor.cc
2013-03-14 21:11:35 -07:00
Gary Lowell
6f15dba931 debian/control: Fix for moved file
The ceph-mds.conf file moced from the ceph package to the
ceph-mds package.  Add replaces/breaks statements to the
control file to handle this on upgrade.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-03-14 17:16:24 -07:00
Andras Elso
0dd956cb02 debian: Fix FTBFS because depend on old libboost-dev
Signed-off-by: Andras Elso <elso.andras@gmail.com>
2013-03-10 01:18:16 +01:00
Alan Grosskurth
a319f5cb74 debian: require libsnappy-dev for ceph
Debian builds are currently broken without this requirement.
2013-03-06 02:21:12 -08:00
Josh Durgin
867586c674 debian: require >= python2.6 for ceph as well
ceph-disk-prepare and ceph-disk-activate use the with statement,
str.format, and possibly other new features from python 2.6.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-03-04 16:49:14 -08:00
Filippos Giannakos
66df847e00 Add X-Python-Version >=2.6 to debian control file.
python-ceph complains when installed to debian squeeze about the 'with'
statement. Apparently installation tries to install the python-ceph package for
python 2.5, which does not support the 'with' statement natively.

Signed-off-by: Filippos Giannakos <philipgian@grnet.gr>
2013-03-04 15:10:00 -08:00
Sage Weil
cfcaceac44 debian: require cryptsetup-bin
This is needed for ceph-disk-prepare's dmcrypt support.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-27 15:43:57 -08:00
Sage Weil
d9d075e976 debian: let dpkg calculate the shlibs dep for leveldb (if any)
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-27 09:45:02 -08:00
Danny Al-Gaaf
f42a63ba1b debian/control: fix Depends
Remove request for libleveldb1 version > 1.2. Every libleveldb1 package
should work, otherwise the SO name/version of the library should change.

Fixes: #3945

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 15:39:18 +01:00
Danny Al-Gaaf
43161532d6 debian/control: add libleveldb-dev to Build-Depends:
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-27 14:47:49 +01:00
Gary Lowell
ea546aef0c Build: Change build to always use system leveldb
Dynamically link to the leveldb installed on the system rather than
statically linking ceph copy.  Remove the --with-system-leveldb config
option, and add a requirement for leveldb libraries for rpm and debian
packages.  Bug 3945.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-26 20:07:49 -08:00
Sage Weil
9217c4ac68 debian: make gdisk, parted requirements, not recommendations.
ceph-prepare-disk (and thus ceph-deploy) need this.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-24 13:31:06 -08:00
Gary Lowell
4a6924a562 install: remove perl dependency
Change the filter in logrotate to use sed instead of perl, and remove the
package dependency on perl.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-04 12:56:01 -08:00
Gary Lowell
16cf9dc67e build: Add new rbd-fuse package
rdb-fuse is a new facility to map ceph rdb images to files.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-01-31 20:35:26 -08:00
Gary Lowell
bebdc70b42 build: Add perl installation dependency to rpm and debian packages.
There was already a dependency on python in the debian control file,
a similar dependency was added to the rpm spec file.  perl is needed
for the logrotate script, so a dependecy was on perl wass added to
both. Bug 3768.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-01-17 22:43:07 -08:00
Gary Lowell
e9231fe6c1 Makefiles: Two new packages needed in the debian build depdencies.
The ceph test programs that are now being built by default require the junit
and libboost-program-options packages.  These have been added to the build
dependecies in the debian control file.

Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
2012-12-16 12:29:54 -08:00
Gary Lowell
37adf2a9f1 packaging: Add ceph-test debian package
The ceph-test package includes optional test and benchmarking programs.
2012-11-27 13:50:25 -08:00
Yehuda Sadeh
2475d0143b Merge branch 'wip-keystone' into wip-rgw-integration
Conflicts:
	debian/control

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 17:19:18 -08:00
Yehuda Sadeh
a99b0fac88 rgw: fix build
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-11-08 13:24:30 -08:00
Noah Watkins
b3cc40a333 java: update deb bits from ceph-devel feedback
Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2012-10-19 10:22:38 -07:00
Noah Watkins
9feb4afdd8 debian: add libcephfs-java package
Creates libceph1-java package that contains
the libcephfs Java wrappers .jar file and the
JNI library.

Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
2012-10-19 09:59:10 -07:00
Tommi Virtanen
662c69e525 ceph-disk-prepare, debian/control: Support external journals.
Previously, ceph-disk-* would only let you use a journal that was a
file inside the OSD data directory. With this, you can do:

  ceph-disk-prepare /dev/sdb /dev/sdb

to put the journal as a second partition on the same disk as the OSD
data (might save some file system overhead), or, more interestingly:

  ceph-disk-prepare /dev/sdb /dev/sdc

which makes it create a new partition on /dev/sdc to use as the
journal. Size of the partition is decided by $osd_journal_size.
/dev/sdc must be a GPT-format disk. Multiple OSDs may share the same
journal disk (using separate partitions); this way, a single fast SSD
can serve as journal for multiple spinning disks.

The second use case currently requires parted, so a Recommends: for
parted has been added to Debian packaging.

Closes: #3078
Closes: #3079
Signed-off-by: Tommi Virtanen <tv@inktank.com>
2012-10-15 09:34:36 -07:00
Tommi Virtanen
d6b065ce91 debian/control, ceph-disk-prepare: Depend on xfsprogs, use xfs by default.
Ext4 as a default is a bad choice, as we don't perform enough QA with
it. To use XFS as the default for ceph-disk-prepare, we need to depend
on xfsprogs.

btrfs-tools is already recommended, so no change there. If you set
osd_fs_type=btrfs, and don't have the package installed, you'll just
get an error message.

Signed-off-by: Tommi Virtanen <tv@inktank.com>
2012-10-05 15:41:35 -07:00
Sage Weil
de930440e7 remove obsync
This now lives at http://github.com/ceph/obsync

Signed-off-by: Sage Weil <sage@inktank.com>
2012-09-17 18:23:39 -07:00
James Page
65c43e341b debian: fix ceph-fs-common-dbg depends
Signed-off-by: James Page <james.page@ubuntu.com>
2012-07-12 06:58:56 -07:00
Tommi Virtanen
ad97415ef7 ceph-disk-prepare: Partition and format OSD data disks automatically.
Uses gdisk, as it seems to be the only tool that can automate GPT uuid
changes. Needs to run as root.

Adds Recommends: gdisk to ceph.deb.

Closes: #2547
Signed-off-by: Tommi Virtanen <tv@inktank.com>
2012-07-03 15:25:52 -07:00
Sage Weil
9d6013e0db debian: move metadata server into ceph-mds
Also adjust the recommends and depends, so that libcephfs1 and ceph-fuse
hang off of ceph-mds instead of ceph.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-27 20:25:13 -07:00
Sage Weil
915f321096 debian: move mount.ceph and cephfs into ceph-fs-common
Based on patches from Laszlo Boszormenyi (GCS) <gcs@debian.hu>.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-27 20:25:13 -07:00
Sage Weil
0d9b558f5c debian: arch linux-any
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-27 20:25:13 -07:00
Laszlo Boszormenyi (GCS)
89492329d1 debian: build with libnss instead of crypto++
Signed-off-by: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
2012-06-27 20:25:13 -07:00
Laszlo Boszormenyi (GCS)
95ac5baed4 debian: fix python-ceph depends
Signed-off-by: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
2012-06-17 13:21:24 -07:00
Laszlo Boszormenyi (GCS)
d7fe0e3fe4 debian: update homepage url
Signed-off-by: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
2012-06-17 13:21:19 -07:00
Sage Weil
c31b4e3100 remove ceph-kdump-copy
Moved to its own repo.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-12 10:10:58 -07:00
Sage Weil
d64600dfae debian: limit build archs
We depend on leveldb, which only builds on

 amd64 armel armhf i386 ia64 mipsel

Reported-by: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-12 10:08:20 -07:00
Sage Weil
d63aca33f0 debian: remove dup python build-dep
Reported-by: Laszlo Boszormenyi (GCS) <gcs@debian.hu>
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-11 15:48:38 -07:00
Sage Weil
83377755d1 debian: ceph depends on python
Due to the new ceph-disk-* scripts.  Newer dists are smart enough to figure
this out, but maverick is not.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 22:10:43 -07:00
Sage Weil
f943f34b83 debian: don't package gceph
Signed-off-by: Sage Weil <sage@inktank.com>
2012-05-17 20:23:33 -07:00
Sage Weil
ac903210d0 Merge branch 'wip-rgw-bench'
Conflicts:
	debian/rules
2012-05-07 15:57:31 -07:00
Sage Weil
caab859b6d debian: kill librgw.so
Signed-off-by: Sage Weil <sage@newdream.net>
2012-05-06 14:50:30 -07:00
Sage Weil
827d222aba debian: build-depend on libxml2-dev
Signed-off-by: Sage Weil <sage@inktank.com>
2012-05-06 08:31:11 -07:00