From: Redouane Kachach Date: Tue, 12 Sep 2023 09:36:16 +0000 (+0200) Subject: cephadm: fix cephadm binary mount when --shared_ceph_folder is used X-Git-Tag: v19.0.0~453^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2726c073efb7b0da125694c483a02b504bd8f00e;p=ceph-ci.git cephadm: fix cephadm binary mount when --shared_ceph_folder is used Fixes: https://tracker.ceph.com/issues/62814 Signed-off-by: Redouane Kachach --- diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py index 176a4ad4988..acc83c66abe 100755 --- a/src/cephadm/cephadm.py +++ b/src/cephadm/cephadm.py @@ -2509,8 +2509,11 @@ def get_container_mounts(ctx, fsid, daemon_type, daemon_id, if ctx.shared_ceph_folder: # make easy manager modules/ceph-volume development ceph_folder = pathify(ctx.shared_ceph_folder) if os.path.exists(ceph_folder): + cephadm_binary = ceph_folder + '/src/cephadm/cephadm' + if not os.path.exists(pathify(cephadm_binary)): + raise Error("cephadm binary does not exist. Please run './build.sh cephadm' from ceph/src/cephadm/ directory.") + mounts[cephadm_binary] = '/usr/sbin/cephadm' mounts[ceph_folder + '/src/ceph-volume/ceph_volume'] = '/usr/lib/python3.6/site-packages/ceph_volume' - 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'