update sources to 12.2.7

[ceph.git] / ceph / src / ceph-volume / ceph_volume / tests / functional / lvm / centos7 / bluestore / dmcrypt / test.yml

diff --git a/ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml b/ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml
index 70c018aa7e3466b0b53edf8f90916c83b8de1296..bbdc1035d25dbd8adcf229cca4ad9f743f7277bd 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml
+++ b/ceph/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml
@@ -1,4 +1,3 @@
-
 - hosts: osds
   become: yes
   tasks:
@@ -8,9 +7,26 @@
         name: ceph-osd@2
         state: stopped
 
+    - name: stop ceph-osd@0 daemon
+      service:
+        name: ceph-osd@0
+        state: stopped
+
+- hosts: mons
+  become: yes
+  tasks:
+
     - name: destroy osd.2
       command: "ceph osd destroy osd.2 --yes-i-really-mean-it"
 
+    - name: destroy osd.0
+      command: "ceph osd destroy osd.0 --yes-i-really-mean-it"
+
+- hosts: osds
+  become: yes
+  tasks:
+
+    # osd.2 device
     - name: zap /dev/sdd1
       command: "ceph-volume lvm zap /dev/sdd1 --destroy"
       environment:
@@ -21,14 +37,7 @@
       environment:
         CEPH_VOLUME_DEBUG: 1
 
-    - name: stop ceph-osd@0 daemon
-      service:
-        name: ceph-osd@0
-        state: stopped
-
-    - name: destroy osd.0
-      command: "ceph osd destroy osd.0 --yes-i-really-mean-it"
-
+    # osd.0 lv
     - name: zap test_group/data-lv1
       command: "ceph-volume lvm zap test_group/data-lv1"
       environment:
@@ -44,9 +53,20 @@
         name: ceph-osd@0
         state: stopped
 
+
+- hosts: mons
+  become: yes
+  tasks:
+
     - name: destroy osd.0
       command: "ceph osd destroy osd.0 --yes-i-really-mean-it"
 
+
+- hosts: osds
+  become: yes
+  tasks:
+
+
     - name: zap test_group/data-lv1
       command: "ceph-volume lvm zap test_group/data-lv1"
       environment: