From: Jeff Layton <jlayton@redhat.com>
Date: Thu, 7 Feb 2019 18:39:59 +0000 (-0500)
Subject: mgr: make orchestrator_cli be always-on
X-Git-Tag: v14.1.0~132^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=55422589cef06195de13c484a48de1cb80467dbe;p=ceph.git

mgr: make orchestrator_cli be always-on

The volumes module has at least a loose dependency on the orchestrator,
and thus also relies on the orchestrator_cli module for the backend
setting. Since the volumes module is always-on, do the same with the
orchestrator_cli module.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/doc/mgr/ansible.rst b/doc/mgr/ansible.rst
index e92c22b6365e6..e81e67baf3065 100644
--- a/doc/mgr/ansible.rst
+++ b/doc/mgr/ansible.rst
@@ -34,7 +34,6 @@ Enable the Ansible orchestrator module and use it with the :ref:`CLI <orchestrat
 
 ::
 
-    ceph mgr module enable orchestrator_cli
     ceph mgr module enable ansible
     ceph orchestrator set backend ansible
 
diff --git a/doc/mgr/orchestrator_cli.rst b/doc/mgr/orchestrator_cli.rst
index b446f6cbd30e6..b85b8c590c5d0 100644
--- a/doc/mgr/orchestrator_cli.rst
+++ b/doc/mgr/orchestrator_cli.rst
@@ -55,7 +55,6 @@ You can select the orchestrator module to use with the ``set backend`` command::
 
 For example, to enable the Rook orchestrator module and use it with the CLI::
 
-    ceph mgr module enable orchestrator_cli
     ceph mgr module enable rook
     ceph orchestrator set backend rook
 
diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 5f2402fb08d82..41729c9fab1d0 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -47,6 +47,7 @@ const static std::map<uint32_t, std::set<std::string>> always_on_modules = {
       "progress",
       "balancer",
       "devicehealth",
+      "orchestrator_cli",
       "volumes",
     }
   }