Merge pull request #2112 from ceph/remove-optional

[skip ci]
2017-10-26 14:23:10 +02:00 · 2017-10-26 14:23:10 +02:00 · fdd6a468b7
parent 5f9e50dabe 2837d0a22e
commit fdd6a468b7
1 changed files with 4 additions and 1 deletions
--- a/infrastructure-playbooks/purge-cluster.yml
+++ b/infrastructure-playbooks/purge-cluster.yml
@ -195,6 +195,7 @@

  vars:
    osd_group_name: osds
+    reboot_osd_node: False

  hosts:
    - "{{ osd_group_name|default('osds') }}"
@ -352,7 +353,9 @@
      - restart machine
      - wait for server to boot
      - remove data
-    when: remove_osd_mountpoints.failed is defined
+    when:
+      - reboot_osd_node
+      - remove_osd_mountpoints.failed is defined

  - name: see if ceph-disk is installed
    shell: "which ceph-disk"