ceph-volume tests functional osd destroy on mons only for dmcrypt

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 953c7ef54925059e6de75c2e11d9d40d909bbbca)

diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml
index 70c018aa7e3466b0b53edf8f90916c83b8de1296..bbdc1035d25dbd8adcf229cca4ad9f743f7277bd 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/bluestore/dmcrypt/test.yml
+++ b/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:

diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/test.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/test.yml
index fc3e38c7aee46de532a7527513d652f5d547eebc..49f37d20aade92b4a861a15cce0121ced2aafcab 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/centos7/filestore/dmcrypt/test.yml
@@ -8,9 +8,28 @@
         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:
@@ -26,14 +45,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:

diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/dmcrypt/test.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/dmcrypt/test.yml
index 9a60ab2e0ecfad9ad06ad4d5e047b42afccf7f54..f93ff2304e3cac1baf248842660f606f8172d466 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/dmcrypt/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/bluestore/dmcrypt/test.yml
@@ -1,4 +1,3 @@
-
 - hosts: osds
   become: yes
   tasks:
@@ -8,33 +7,44 @@
         name: ceph-osd@2
         state: stopped
 
-    - name: destroy osd.2 
+    - 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: zap /dev/sdd1 
+    - 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:
         CEPH_VOLUME_DEBUG: 1
 
-    - name: redeploy osd.2 using /dev/sdd1 
+    - name: redeploy osd.2 using /dev/sdd1
       command: "ceph-volume lvm create --bluestore --data /dev/sdd1 --osd-id 2"
       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"
-
-    - name: zap test_group/data-lv1 
+    # osd.0 lv
+    - name: zap test_group/data-lv1
       command: "ceph-volume lvm zap test_group/data-lv1"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
-    - name: redeploy osd.0 using test_group/data-lv1 
+    - name: redeploy osd.0 using test_group/data-lv1
       command: "ceph-volume lvm create --bluestore --data test_group/data-lv1 --osd-id 0"
       environment:
         CEPH_VOLUME_DEBUG: 1
@@ -44,9 +54,19 @@
         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:

diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/dmcrypt/test.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/dmcrypt/test.yml
index fc3e38c7aee46de532a7527513d652f5d547eebc..49f37d20aade92b4a861a15cce0121ced2aafcab 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/dmcrypt/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/xenial/filestore/dmcrypt/test.yml
@@ -8,9 +8,28 @@
         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:
@@ -26,14 +45,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: