From: John Spray <john.spray@redhat.com>
Date: Fri, 23 Dec 2016 17:31:32 +0000 (+0000)
Subject: vstart.sh: enable running with FS=0
X-Git-Tag: v12.0.0~56^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83dc2e5bb1b5453c9915f2a27d0d4c5e8d51585b;p=ceph.git

vstart.sh: enable running with FS=0

Useful for vstart_runner.py to create a cluster
with no filesystem (CephFSTestCase does the
filesystem creation)

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 6be6757871b..e238f8ab3ae 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -701,19 +701,21 @@ EOF
 fi
 
 if [ "$start_mds" -eq 1 -a "$CEPH_NUM_MDS" -gt 0 ]; then
-    if [ "$CEPH_NUM_FS" -gt "1" ] ; then
-        ceph_adm fs flag set enable_multiple true --yes-i-really-mean-it
-    fi
+    if [ "$CEPH_NUM_FS" -gt "0" ] ; then
+        if [ "$CEPH_NUM_FS" -gt "1" ] ; then
+            ceph_adm fs flag set enable_multiple true --yes-i-really-mean-it
+        fi
 
-    fs=0
-    for name in a b c d e f g h i j k l m n o p
-    do
-        ceph_adm osd pool create "cephfs_data_${name}" 8
-        ceph_adm osd pool create "cephfs_metadata_${name}" 8
-        ceph_adm fs new "cephfs_${name}" "cephfs_metadata_${name}" "cephfs_data_${name}"
-        fs=$(($fs + 1))
-        [ $fs -eq $CEPH_NUM_FS ] && break
-    done
+        fs=0
+        for name in a b c d e f g h i j k l m n o p
+        do
+            ceph_adm osd pool create "cephfs_data_${name}" 8
+            ceph_adm osd pool create "cephfs_metadata_${name}" 8
+            ceph_adm fs new "cephfs_${name}" "cephfs_metadata_${name}" "cephfs_data_${name}"
+            fs=$(($fs + 1))
+            [ $fs -eq $CEPH_NUM_FS ] && break
+        done
+    fi
 
     mds=0
     for name in a b c d e f g h i j k l m n o p