From f344a4810c9b261864d9c5a854ca3dda3ead55f2 Mon Sep 17 00:00:00 2001 From: Gaudenz Steinlin Date: Tue, 27 Aug 2019 15:15:35 +0200 Subject: [PATCH] osd: Fix number of OSD calculation If some OSDs are to be created and others already exist the calculation only counted the to be created OSDs. This changes the calculation to take all OSDs into account. Signed-off-by: Gaudenz Steinlin (cherry picked from commit 15044da03052fcb4a3c45f344f41e06b0d418e4d) --- roles/ceph-config/tasks/main.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml index 9a94a485b..20fa9832c 100644 --- a/roles/ceph-config/tasks/main.yml +++ b/roles/ceph-config/tasks/main.yml @@ -80,14 +80,12 @@ changed_when: false when: - devices | default([]) | length > 0 - - 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 (add existing osds) set_fact: - num_osds: "{{ lvm_list.stdout | default('{}') | from_json | length | int }}" + num_osds: "{{ lvm_list.stdout | default('{}') | from_json | length | int + num_osds | default(0) | int }}" when: - devices | default([]) | length > 0 - - not (lvm_batch_report.stdout | default('{}') | from_json).changed | default(false) | bool # ceph-common - name: config file operation for non-containerized scenarios -- 2.39.5