update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / doc / mgr / administrator.rst

diff --git a/ceph/doc/mgr/administrator.rst b/ceph/doc/mgr/administrator.rst
index 11daf3e42a046b1bb7da4c393fbbea55bb7fab33..ccffe8072d08e5bc61dbbaa7a0c801c88c2bf385 100644 (file)
--- a/ceph/doc/mgr/administrator.rst
+++ b/ceph/doc/mgr/administrator.rst
@@ -75,7 +75,7 @@ daemon, if the client tries to connect to a standby.
 Consult the documentation pages for individual manager modules for more
 information about what functionality each module provides.
 
-Here is an example of enabling the ``dashboard`` module:
+Here is an example of enabling the :term:`Dashboard` module:
 
 ::
 
@@ -109,6 +109,18 @@ Here is an example of enabling the ``dashboard`` module:
        }
 
 
+The first time the cluster starts, it uses the ``mgr_initial_modules``
+setting to override which modules to enable.  However, this setting
+is ignored through the rest of the lifetime of the cluster: only
+use it for bootstrapping.  For example, before starting your
+monitor daemons for the first time, you might add a section like
+this to your ``ceph.conf``:
+
+::
+
+    [mon]
+        mgr initial modules = dashboard balancer
+
 Calling module commands
 -----------------------
 
@@ -129,8 +141,6 @@ simply ``mgr`` will pick the current active daemon.
 Configuration
 -------------
 
-OPTION(mgr_module_path, OPT_STR, CEPH_PKGLIBDIR "/mgr") // where to load python modules from
-
 ``mgr module path``
 
 :Description: Path to load modules from