mirror of https://github.com/ceph/ceph-ansible.git
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
parent
f33c1cd2d2
commit
4895c2864e
|
@ -134,6 +134,7 @@ dummy:
|
|||
# - /dev/sdf
|
||||
# - /dev/sdg
|
||||
# - /dev/sdg
|
||||
#raw_journal_devices: []
|
||||
|
||||
|
||||
# III. Use directory instead of disk for OSDs
|
||||
|
|
|
@ -126,6 +126,7 @@ raw_multi_journal: false
|
|||
# - /dev/sdf
|
||||
# - /dev/sdg
|
||||
# - /dev/sdg
|
||||
raw_journal_devices: []
|
||||
|
||||
|
||||
# III. Use directory instead of disk for OSDs
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
- name: check the partition status of the journal devices
|
||||
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
|
||||
failed_when: false
|
||||
register: journal_partition_status
|
||||
|
@ -32,7 +32,7 @@
|
|||
shell: "sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }} || sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }}"
|
||||
with_together:
|
||||
- "{{ journal_partition_status.results }}"
|
||||
- "{{ raw_journal_devices|default([])|unique }}"
|
||||
- "{{ raw_journal_devices|unique }}"
|
||||
changed_when: false
|
||||
when:
|
||||
- raw_multi_journal
|
||||
|
|
Loading…
Reference in New Issue