mgr/ssh: rename option ceph_daemon_path -> cephadm_path

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/options.cc b/src/common/options.cc
index a6918ab3a58a2cba08dfee9c310f4fd5a9c21609..10f1ad36469183c31fc8d646ae7daa26382cc639 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -5111,7 +5111,7 @@ std::vector<Option> get_global_options() {
     .set_default(false)
     .set_description(""),
 
-    Option("ceph_daemon_path", Option::TYPE_STR, Option::LEVEL_ADVANCED)
+    Option("cephadm_path", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("/usr/sbin/cephadm")
     .add_service("mgr")
     .set_description("Path to cephadm utility"),

diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py
index 82a1c39fa7ddcf37c049cbbc5694f55bd31811cd..c6d0c283831927fc5f2981ab4aef8d47afbcfad0 100644 (file)
--- a/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@ -276,7 +276,7 @@ class SSHOrchestrator(MgrModule, orchestrator.Orchestrator):
 
         self.config_notify()
 
-        path = self.get_ceph_option('ceph_daemon_path')
+        path = self.get_ceph_option('cephadm_path')
         try:
             with open(path, 'r') as f:
                 self._ceph_daemon = f.read()

diff --git a/src/vstart.sh b/src/vstart.sh
index 28a7ac18c8b6267863595ecfb52aaf5e20d89553..56258a47b37eb25414e37e5eccb3d480955c439e 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -712,7 +712,7 @@ $extra_conf
 [mgr]
         mgr data = $CEPH_DEV_DIR/mgr.\$id
         mgr module path = $MGR_PYTHON_PATH
-        ceph daemon path = $CEPH_ROOT/src/cephadm/cephadm
+        cephadm path = $CEPH_ROOT/src/cephadm/cephadm
 $DAEMONOPTS
 $extra_conf
 [osd]