Merge pull request #288 from leseb/fix-prepare-logic

Followup on #287
2015-06-25 23:52:57 +02:00 · 2015-06-25 23:52:57 +02:00 · 2b803e218c
parent 9b294006ce d9a38489f9
commit 2b803e218c
1 changed files with 5 additions and 1 deletions
--- a/roles/ceph-osd/tasks/journal_collocation.yml
+++ b/roles/ceph-osd/tasks/journal_collocation.yml
@ -19,7 +19,11 @@

 - name: manually Prepare OSD disk(s)
  command: "ceph-disk prepare {{ item.2 }}"
-  when: (item.0.rc != 0 or item.1.rc != 0) and journal_collocation and not osd_auto_discovery
+  when:
+    item.0.rc != 0 and
+    item.1.rc != 0 and
+    journal_collocation and not
+    osd_auto_discovery
  ignore_errors: True
  with_together:
    - parted.results