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 #1069 from ceph/dmycrypt-checks 

osd dmcrypt: add ability to check devices
pull/1070/head
Andrew Schoen 2016-11-03 10:28:22 -05:00 committed by GitHub
parent d4320d4dea 32018f80a1
commit 6115ad11d5
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,12 +11,16 @@
# for SSD journals. # for SSD journals.
- include: ./check_devices_static.yml - include: ./check_devices_static.yml
when: not osd_auto_discovery when:
- not osd_auto_discovery
- not osd_directory
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent) # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False static: False
- include: ./check_devices_auto.yml - include: ./check_devices_auto.yml
when: osd_auto_discovery when:
- osd_auto_discovery
- not osd_directory
# Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent) # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
static: False static: False
@ -26,7 +30,7 @@
changed_when: false changed_when: false
failed_when: false failed_when: false
register: journal_partition_status register: journal_partition_status
when: raw_multi_journal when: raw_multi_journal or dmcrypt_dedicated_journal
- name: fix partitions gpt header or labels of the journal devices - name: fix partitions gpt header or labels of the journal devices
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 }}"
@ -35,5 +39,5 @@
- "{{ raw_journal_devices|unique }}" - "{{ raw_journal_devices|unique }}"
changed_when: false changed_when: false
when: when:
- raw_multi_journal - raw_multi_journal or dmcrypt_dedicated_journal
- item.0.rc != 0 - item.0.rc != 0

2
roles/ceph-osd/tasks/check_devices_auto.yml
View File

@ -16,7 +16,6 @@
failed_when: false failed_when: false
register: osd_partition_status_results register: osd_partition_status_results
when: when:
- journal_collocation or raw_multi_journal
- ansible_devices is defined - ansible_devices is defined
- item.value.removable == "0" - item.value.removable == "0"
- item.value.partitions|count == 0 - item.value.partitions|count == 0
@ -28,7 +27,6 @@
- "{{ ansible_devices }}" - "{{ ansible_devices }}"
changed_when: false changed_when: false
when: when:
- journal_collocation
- ansible_devices is defined - ansible_devices is defined
- item.0.item.value.removable == "0" - item.0.item.value.removable == "0"
- item.0.item.value.partitions|count == 0 - item.0.item.value.partitions|count == 0

6
roles/ceph-osd/tasks/check_devices_static.yml
View File

@ -12,8 +12,6 @@
changed_when: false changed_when: false
failed_when: false failed_when: false
register: osd_partition_status_results register: osd_partition_status_results
when:
- journal_collocation or raw_multi_journal
# NOTE: The following calls to sgdisk are retried because sgdisk is known to # NOTE: The following calls to sgdisk are retried because sgdisk is known to
# fully wipe a device the first time around. There is no need to halt execution # fully wipe a device the first time around. There is no need to halt execution
@ -26,9 +24,7 @@
- "{{ osd_partition_status_results.results }}" - "{{ osd_partition_status_results.results }}"
- "{{ devices }}" - "{{ devices }}"
changed_when: false changed_when: false
when: when: item.0.rc != 0
- journal_collocation or raw_multi_journal
- item.0.rc != 0
- name: check if a partition named 'ceph' exists - name: check if a partition named 'ceph' exists
shell: "parted --script {{ item }} print | egrep -sq '^ 1.*ceph'" shell: "parted --script {{ item }} print | egrep -sq '^ 1.*ceph'"