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 #148 from shinespb/master 

added auto-discovery of OSD disks
pull/155/head
Leseb 2014-12-11 16:15:57 +01:00
parent 2ebbd31103 ce569b8c6e
commit be7fddde5b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
group_vars/all
View File

@ -33,6 +33,7 @@ dummy:
## OSD options ## OSD options
# #
#osd_auto_discovery: true
#journal_size: 100 #journal_size: 100
#pool_default_pg_num: 128 #pool_default_pg_num: 128
#pool_default_pgp_num: 128 #pool_default_pgp_num: 128

10
roles/ceph-osd/tasks/journal_collocation.yml
View File

@ -18,10 +18,16 @@
# NOTE (alahouze): if the device is a partition, the parted command below has # NOTE (alahouze): if the device is a partition, the parted command below has
# failed, this is why we check if the device is a partition too. # failed, this is why we check if the device is a partition too.
- name: Automatic prepare OSD disk(s) without partitions
command: ceph-disk prepare "/dev/{{ item.key }}"
when: ansible_devices is defined and item.value.removable == "0" and item.value.partitions|count == 0 and journal_collocation and osd_auto_discovery
ignore_errors: True
with_dict: ansible_devices
register: prepared_osds
- name: Prepare OSD disk(s) - name: Manually Prepare OSD disk(s)
command: "ceph-disk prepare {{ item.2 }}" command: "ceph-disk prepare {{ item.2 }}"
when: (item.0.rc != 0 or item.1.rc != 0) and journal_collocation when: (item.0.rc != 0 or item.1.rc != 0) and journal_collocation and not osd_auto_discovery
ignore_errors: True ignore_errors: True
with_together: with_together:
- parted.results - parted.results