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

Make {{ raw_journal_devices }} list optional: define it as empty list by default, remove unneccessary 'default([])' checks 

Signed-off-by: Eduard Egorov <eduard.egorov@icl-services.com>
pull/1024/head
Eduard Egorov 2016-10-24 18:37:28 +00:00
parent f33c1cd2d2
commit 4895c2864e
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
group_vars/osds.sample
View File

@ -134,6 +134,7 @@ dummy:
# - /dev/sdf # - /dev/sdf
# - /dev/sdg # - /dev/sdg
# - /dev/sdg # - /dev/sdg
#raw_journal_devices: []
# III. Use directory instead of disk for OSDs # III. Use directory instead of disk for OSDs

1
roles/ceph-osd/defaults/main.yml
View File

@ -126,6 +126,7 @@ raw_multi_journal: false
# - /dev/sdf # - /dev/sdf
# - /dev/sdg # - /dev/sdg
# - /dev/sdg # - /dev/sdg
raw_journal_devices: []
# III. Use directory instead of disk for OSDs # III. Use directory instead of disk for OSDs

4
roles/ceph-osd/tasks/check_devices.yml
View File

@ -22,7 +22,7 @@
- name: check the partition status of the journal devices - name: check the partition status of the journal devices
shell: "parted --script {{ item }} print > /dev/null 2>&1" shell: "parted --script {{ item }} print > /dev/null 2>&1"
with_items: "{{ raw_journal_devices|default([])|unique }}" with_items: "{{ raw_journal_devices|unique }}"
changed_when: false changed_when: false
failed_when: false failed_when: false
register: journal_partition_status register: journal_partition_status
@ -32,7 +32,7 @@
shell: "sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }} || sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }}" shell: "sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }} || sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }}"
with_together: with_together:
- "{{ journal_partition_status.results }}" - "{{ journal_partition_status.results }}"
- "{{ raw_journal_devices|default([])|unique }}" - "{{ raw_journal_devices|unique }}"
changed_when: false changed_when: false
when: when:
- raw_multi_journal - raw_multi_journal