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 <gaudenz.steinlin@cloudscale.ch>

diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml
index faa71e2590f888d320a41ebfd4d5a9e547ae59c5..faffcc3d71ce82f993f02f3f1c27835a8e081eef 100644 (file)
--- 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
 
 - name: create ceph conf directory
   file: