From: Alfredo Deza <adeza@redhat.com>
Date: Mon, 9 Apr 2018 17:55:59 +0000 (-0400)
Subject: ceph-volume tests/functional add 'activate all' for centos7/bluestore/dmcrypt
X-Git-Tag: v12.2.5~5^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=162c2046c51a34c9a5e13402c46d07d4a2142739;p=ceph.git

ceph-volume tests/functional add 'activate all' for centos7/bluestore/dmcrypt

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

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 2009aaefb4ef..70c018aa7e34 100644
--- 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
@@ -8,15 +8,15 @@
         name: ceph-osd@2
         state: stopped
 
-    - name: destroy osd.2 
+    - name: destroy osd.2
       command: "ceph osd destroy osd.2 --yes-i-really-mean-it"
 
-    - name: zap /dev/sdd1 
+    - 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
@@ -26,15 +26,38 @@
         name: ceph-osd@0
         state: stopped
 
-    - name: destroy osd.0 
+    - name: destroy osd.0
       command: "ceph osd destroy osd.0 --yes-i-really-mean-it"
 
-    - name: zap test_group/data-lv1 
+    - 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
+
+    - 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
+      command: "ceph-volume lvm zap test_group/data-lv1"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+
+    - name: prepare osd.0 using test_group/data-lv1
+      command: "ceph-volume lvm prepare --bluestore --data test_group/data-lv1 --osd-id 0"
+      environment:
+        CEPH_VOLUME_DEBUG: 1
+
+    - name: activate all to start the previously prepared osd.0
+      command: "ceph-volume lvm activate --all"
+      environment:
+        CEPH_VOLUME_DEBUG: 1