Merge pull request #1890 from ceph/lvm-setup

tests: fix lvm_setup.yml for purge_cluster.yml

tests/functional/lvm_setup.yml

@@ -21,6 +21,21 @@
       command: lvcreate --yes -l 50%FREE -n data-lv2 test_group
       failed_when: false
 
+    # purge-cluster.yml does not properly destroy partitions
+    # used for lvm osd journals, this ensures they are removed
+    # for that testing scenario
+    - name: remove /dev/sdc1 if it exists
+      parted:
+        device: /dev/sdc
+        number: 1
+        state: absent
+
+    - name: remove /dev/sdc2 if it exists
+      parted:
+        device: /dev/sdc
+        number: 2
+        state: absent
+
     - name: partition /dev/sdc for journals
       parted:
         device: /dev/sdc
@@ -42,11 +57,6 @@
         unit: '%'
         state: present
 
-    - name: create filesystem on /dev/sdc1
-      filesystem:
-        fstype: ext4
-        dev: /dev/sdc1
-
     - name: create journals vg from /dev/sdc2
       lvg:
         vg: journals