ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #260 from flisky/master 

make sure journal_size configured
pull/262/head
Leseb 2015-05-15 10:46:20 +02:00
parent 5c497a7c63 03508a7ab2
commit 61eebb526a
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Vagrantfile vendored
View File

@ -53,6 +53,7 @@ ansible_provision = proc do |ansible|
ansible.extra_vars = { ansible.extra_vars = {
fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45', fsid: '4a158d27-f750-41d5-9e7f-26ce4c9d2d45',
monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==', monitor_secret: 'AQAWqilTCDh7CBAAawXt6kyTgLFCxSvJhTEmuw==',
journal_size: 100,
} }
end end
ansible.limit = 'all' ansible.limit = 'all'

2
group_vars/all
View File

@ -72,7 +72,7 @@ dummy:
## OSD options ## OSD options
# #
#journal_size: 100 #journal_size: 0
#pool_default_pg_num: 128 #pool_default_pg_num: 128
#pool_default_pgp_num: 128 #pool_default_pgp_num: 128
#pool_default_size: 2 #pool_default_size: 2

2
roles/ceph-common/defaults/main.yml
View File

@ -83,7 +83,7 @@ mon_osd_report_timeout: 300
## OSD options ## OSD options
# #
journal_size: 100 journal_size: 0
pool_default_pg_num: 128 pool_default_pg_num: 128
pool_default_pgp_num: 128 pool_default_pgp_num: 128
pool_default_size: 2 pool_default_size: 2

4
roles/ceph-common/tasks/main.yml
View File

@ -35,6 +35,10 @@
register: cluster_uuid register: cluster_uuid
changed_when: False changed_when: False
- name: Make sure journal_size configured
fail: msg="journal_size must be configured. See http://ceph.com/docs/master/rados/configuration/osd-config-ref/"
when: journal_size|int == 0
- name: Generate Ceph configuration file - name: Generate Ceph configuration file
template: > template: >
src=ceph.conf.j2 src=ceph.conf.j2