From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 6 Jun 2018 13:02:42 +0000 (-0400)
Subject: ceph-volume tests/functional destroy filestore osds on the monitors
X-Git-Tag: v13.2.1~132^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=151bd5da2bbd81a974206f6e1946df278a001471;p=ceph.git

ceph-volume tests/functional destroy filestore osds on the monitors

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

diff --git a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml
index fc3e38c7aee4..d37efe19dff4 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/lvm/playbooks/test_filestore.yml
@@ -8,14 +8,34 @@
         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:
         CEPH_VOLUME_DEBUG: 1
 
+    # osd.2 journal
     - name: zap /dev/sdd2
       command: "ceph-volume lvm zap /dev/sdd2 --destroy"
       environment:
@@ -26,19 +46,13 @@
       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 data lv
     - name: zap test_group/data-lv1
       command: "ceph-volume lvm zap test_group/data-lv1"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
+    # osd.0 journal device
     - name: zap /dev/sdc1
       command: "ceph-volume lvm zap /dev/sdc1 --destroy"
       environment: