From: Michael Fritch Date: Mon, 6 Dec 2021 20:42:56 +0000 (-0700) Subject: cephadm: compile cephadm X-Git-Tag: v18.0.0~7^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6fd601aa4c2402b179e9724be13999d891018e32;p=ceph.git cephadm: compile cephadm use cephadm.py when mounting via the `--dev_share_folder` option Signed-off-by: Michael Fritch --- diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index f304409e768..25c18553ab1 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2949,7 +2949,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/cephadm/cephadm.py'] = '/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/ceph-mixin/dashboards_out'] = '/etc/grafana/dashboards/ceph-dashboard'