Merge pull request #2 from ceph/master

Rebase from upstream
pull/142/head
Matthew Rees 2014-11-10 16:44:35 +02:00
commit 85cd3d9fe4
3 changed files with 9 additions and 1 deletions

View File

@ -36,3 +36,6 @@
- name: Disable OSD directory parsing by updatedb
command: updatedb -e /var/lib/ceph
ignore_errors: true
- name: Increase PID max value to a very large value
sysctl: name="kernel.pid_max" value=4194303 state=present sysctl_file=/etc/sysctl.conf

View File

@ -56,6 +56,11 @@
debug_rgw = 0/0
{% endif %}
[client]
rbd cache = true
rbd cache writethrough until flush = true
admin socket = /var/run/ceph/rbd-client-$pid.asok
[mon]
mon osd down out interval = {{ mon_osd_down_out_interval }}
mon osd min down reporters = {{ mon_osd_min_down_reporters }}

View File

@ -10,7 +10,7 @@
## Packages branch
ceph_key: https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc
ceph_stable: true # use ceph stable branch
ceph_stable_release: firefly # ceph stable release
ceph_stable_release: giant # ceph stable release
# This option is needed for _both_ stable and dev version, so please always fill the right version
# # supported distros are el6, rhel6, f18, f19, opensuse12.2, sles11, centos7 (see http://ceph.com/rpm-firefly/)