From: Willem Jan Withagen <wjw@digiware.nl>
Date: Sun, 22 Aug 2021 20:08:46 +0000 (+0200)
Subject: src/vstart.sh: put modules option for MGR in the [mgr] block.
X-Git-Tag: v17.1.0~1035^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F42881%2Fhead;p=ceph.git

src/vstart.sh: put modules option for MGR in the [mgr] block.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
---

diff --git a/src/vstart.sh b/src/vstart.sh
index 0a355fb5a4d..a0481e3e44d 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -733,6 +733,7 @@ $DAEMONOPTS
         mds root ino gid = `id -g`
         $(format_conf "${extra_conf}")
 [mgr]
+        mgr disabled modules = rook
         mgr data = $CEPH_DEV_DIR/mgr.\$id
         mgr module path = $MGR_PYTHON_PATH
         cephadm path = $CEPH_ROOT/src/cephadm/cephadm
@@ -768,7 +769,6 @@ $COSDSHORT
 [mon]
         mon_data_avail_crit = 1
         mgr initial modules = $mgr_modules
-        mgr disabled modules = rook
 $DAEMONOPTS
 $CMONDEBUG
         $(format_conf "${extra_conf}")