Merge pull request #902 from ceph/journal-default

common: set journal size to 5GB
pull/906/head
Leseb 2016-07-26 13:53:26 +02:00 committed by GitHub
commit 5a26dff9c0
3 changed files with 5 additions and 5 deletions

View File

@ -258,7 +258,7 @@ dummy:
## OSD options
#
#journal_size: 0 # OSD journal size in MB
#journal_size: 5120 # OSD journal size in MB
#public_network: 0.0.0.0/0
#cluster_network: "{{ public_network }}"
#osd_mkfs_type: xfs

View File

@ -250,7 +250,7 @@ mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the
## OSD options
#
journal_size: 0 # OSD journal size in MB
journal_size: 5120 # OSD journal size in MB
public_network: 0.0.0.0/0
cluster_network: "{{ public_network }}"
osd_mkfs_type: xfs

View File

@ -33,10 +33,10 @@
- package-install
- name: make sure journal_size configured
fail:
msg: "journal_size must be configured. See http://ceph.com/docs/master/rados/configuration/osd-config-ref/"
debug:
msg: "WARNING: journal_size is configured to less than 5GB. This is not recommended and can lead to severe issues."
when:
- journal_size|int == 0
- journal_size|int < 5120
- osd_objectstore != 'bluestore'
- osd_group_name in group_names