Merge pull request ceph#42881 from wjwithagen/wjw-fix-vstart-mgr

src/vstart.sh: put modules option for MGR in the [mgr] block. Reviewed-by: Kefu Chai <[email protected]>
sarvex · Aug 24, 2021 · 60811bf · 60811bf
2 parents 75ea722 + 82d1e68
commit 60811bf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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}")