From: Sage Weil <sage@redhat.com>
Date: Wed, 11 Dec 2019 19:49:21 +0000 (-0600)
Subject: mgr/ssh: rename option ceph_daemon_path -> cephadm_path
X-Git-Tag: v15.1.0~544^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=caf95211c05e1c6a8f3a571a74e668bfd8486e64;p=ceph.git

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 a6918ab3a58a..10f1ad364691 100644
--- 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 82a1c39fa7dd..c6d0c2838319 100644
--- 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 28a7ac18c8b6..56258a47b37e 100755
--- 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]