]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: shared folder: Mount the cephadm
authorSebastian Wagner <sewagner@redhat.com>
Fri, 25 Jun 2021 15:35:30 +0000 (17:35 +0200)
committerSebastian Wagner <sewagner@redhat.com>
Tue, 10 Aug 2021 14:31:20 +0000 (16:31 +0200)
When using shared_ceph_folder, also mount `cephadm`

Signed-off-by: Sebastian Wagner <sewagner@redhat.com>
(cherry picked from commit 3a46caf1214726e957319543a69c32bf055a5136)

src/cephadm/cephadm

index d3f83950d406000a96c7d019c35690232aef65e5..5a67d5b342ff5c35b376c8dff9d626598b18ed3b 100755 (executable)
@@ -2361,6 +2361,7 @@ def get_container_mounts(ctx, fsid, daemon_type, daemon_id,
             ceph_folder = pathify(ctx.shared_ceph_folder)
             if os.path.exists(ceph_folder):
                 mounts[ceph_folder + '/src/ceph-volume/ceph_volume'] = '/usr/lib/python3.6/site-packages/ceph_volume'
+                mounts[ceph_folder + '/src/cephadm/cephadm'] = '/usr/sbin/cephadm'
                 mounts[ceph_folder + '/src/pybind/mgr'] = '/usr/share/ceph/mgr'
                 mounts[ceph_folder + '/src/python-common/ceph'] = '/usr/lib/python3.6/site-packages/ceph'
                 mounts[ceph_folder + '/monitoring/grafana/dashboards'] = '/etc/grafana/dashboards/ceph-dashboard'