From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 8 Jun 2017 17:18:40 +0000 (+0200)
Subject: tests: ceph-disk add ceph-mgr during activation tests
X-Git-Tag: ses5-milestone9~1^2~6^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=625a7d515bce04cb9a003afcd3731f280065e85c;p=ceph.git

tests: ceph-disk add ceph-mgr during activation tests

Signed-off-by: Loic Dachary <loic@dachary.org>
---

diff --git a/src/ceph-disk/tests/ceph-disk.sh b/src/ceph-disk/tests/ceph-disk.sh
index 828bb9143fd7..818fd55e45fb 100755
--- a/src/ceph-disk/tests/ceph-disk.sh
+++ b/src/ceph-disk/tests/ceph-disk.sh
@@ -292,17 +292,18 @@ function test_activate_dir() {
     local dir=$1
     shift
 
-    run_mon $dir a
+    run_mon $dir a || return 1
+    run_mgr $dir x || return 1
     $@
 
-    local osd_data=$dir/dir
-    $mkdir -p $osd_data
-    test_activate $osd_data $osd_data || return 1
+    test_activate $dir $dir/dir || return 1
 }
 
 function test_activate_dir_bluestore() {
     local dir=$1
-    run_mon $dir a
+
+    run_mon $dir a || return 1
+    run_mgr $dir x || return 1
 
     local osd_data=$dir/dir
     $mkdir -p $osd_data