mirror of https://github.com/ceph/ceph-ansible.git
config: exclude ceph-disk prepared osds in lvm batch report
We must exclude the devices already used and prepared by ceph-disk when
doing the lvm batch report. Otherwise it fails because ceph-volume
complains about GPT header.
Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1786682
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit fd1718f379
)
pull/4915/head
parent
09ccf22052
commit
d6921f798d
|
@ -15,31 +15,54 @@
|
||||||
num_osds: "{{ lvm_volumes | length | int }}"
|
num_osds: "{{ lvm_volumes | length | int }}"
|
||||||
when: lvm_volumes | default([]) | length > 0
|
when: lvm_volumes | default([]) | length > 0
|
||||||
|
|
||||||
- name: run 'ceph-volume lvm batch --report' to see how many osds are to be created
|
- block:
|
||||||
ceph_volume:
|
- name: look up for ceph-volume rejected devices
|
||||||
cluster: "{{ cluster }}"
|
ceph_volume:
|
||||||
objectstore: "{{ osd_objectstore }}"
|
cluster: "{{ cluster }}"
|
||||||
batch_devices: "{{ devices }}"
|
action: "inventory"
|
||||||
osds_per_device: "{{ osds_per_device | default(1) | int }}"
|
register: rejected_devices
|
||||||
journal_size: "{{ journal_size }}"
|
environment:
|
||||||
block_db_size: "{{ block_db_size }}"
|
CEPH_VOLUME_DEBUG: 1
|
||||||
report: true
|
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
|
||||||
action: "batch"
|
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
|
||||||
register: lvm_batch_report
|
PYTHONIOENCODING: utf-8
|
||||||
environment:
|
|
||||||
CEPH_VOLUME_DEBUG: 1
|
- name: set_fact rejected_devices
|
||||||
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
|
set_fact:
|
||||||
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
|
_rejected_devices: "{{ _rejected_devices | default([]) + [item.path] }}"
|
||||||
PYTHONIOENCODING: utf-8
|
with_items: "{{ rejected_devices.stdout | default('{}') | from_json }}"
|
||||||
changed_when: false
|
when: "'Used by ceph-disk' in item.rejected_reasons"
|
||||||
when: devices | default([]) | length > 0
|
|
||||||
|
- name: set_fact _devices
|
||||||
|
set_fact:
|
||||||
|
_devices: "{{ devices | difference(_rejected_devices | default([])) }}"
|
||||||
|
|
||||||
|
- name: run 'ceph-volume lvm batch --report' to see how many osds are to be created
|
||||||
|
ceph_volume:
|
||||||
|
cluster: "{{ cluster }}"
|
||||||
|
objectstore: "{{ osd_objectstore }}"
|
||||||
|
batch_devices: "{{ _devices }}"
|
||||||
|
osds_per_device: "{{ osds_per_device | default(1) | int }}"
|
||||||
|
journal_size: "{{ journal_size }}"
|
||||||
|
block_db_size: "{{ block_db_size }}"
|
||||||
|
report: true
|
||||||
|
action: "batch"
|
||||||
|
register: lvm_batch_report
|
||||||
|
environment:
|
||||||
|
CEPH_VOLUME_DEBUG: 1
|
||||||
|
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
|
||||||
|
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
|
||||||
|
PYTHONIOENCODING: utf-8
|
||||||
|
when: _devices | default([]) | length > 0
|
||||||
|
when:
|
||||||
|
- devices | default([]) | length > 0
|
||||||
|
|
||||||
- name: set_fact num_osds from the output of 'ceph-volume lvm batch --report'
|
- name: set_fact num_osds from the output of 'ceph-volume lvm batch --report'
|
||||||
set_fact:
|
set_fact:
|
||||||
num_osds: "{{ (lvm_batch_report.stdout | from_json).osds | length | int }}"
|
num_osds: "{{ ((lvm_batch_report.stdout | default('{}') | from_json).osds | default([]) | length | int) + (_rejected_devices | default([]) | length | int) }}"
|
||||||
when:
|
when:
|
||||||
- devices | default([]) | length > 0
|
- devices | default([]) | length > 0
|
||||||
- (lvm_batch_report.stdout | from_json).changed
|
- (lvm_batch_report.stdout | default('{}') | from_json).changed | default(true) | bool
|
||||||
|
|
||||||
- name: run 'ceph-volume lvm list' to see how many osds have already been created
|
- name: run 'ceph-volume lvm list' to see how many osds have already been created
|
||||||
ceph_volume:
|
ceph_volume:
|
||||||
|
@ -53,14 +76,14 @@
|
||||||
changed_when: false
|
changed_when: false
|
||||||
when:
|
when:
|
||||||
- devices | default([]) | length > 0
|
- devices | default([]) | length > 0
|
||||||
- not (lvm_batch_report.stdout | from_json).changed
|
- not (lvm_batch_report.stdout | default('{}') | from_json).changed | default(false) | bool
|
||||||
|
|
||||||
- name: set_fact num_osds from the output of 'ceph-volume lvm list'
|
- name: set_fact num_osds from the output of 'ceph-volume lvm list'
|
||||||
set_fact:
|
set_fact:
|
||||||
num_osds: "{{ lvm_list.stdout | from_json | length | int }}"
|
num_osds: "{{ lvm_list.stdout | default('{}') | from_json | length | int }}"
|
||||||
when:
|
when:
|
||||||
- devices | default([]) | length > 0
|
- devices | default([]) | length > 0
|
||||||
- not (lvm_batch_report.stdout | from_json).changed
|
- not (lvm_batch_report.stdout | default('{}') | from_json).changed | default(false) | bool
|
||||||
|
|
||||||
# ceph-common
|
# ceph-common
|
||||||
- name: config file operation for non-containerized scenarios
|
- name: config file operation for non-containerized scenarios
|
||||||
|
|
Loading…
Reference in New Issue