From: Nizamudeen A Date: Thu, 11 Jul 2024 07:53:57 +0000 (+0530) Subject: cephadm: update shared folder python packages dir X-Git-Tag: v20.0.0~1431^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e17e9b6752b3a542f7873a96de37a85e5f01241;p=ceph.git cephadm: update shared folder python packages dir after centos9 our python version is 3.9 so shouldn't we use the python3.9 path instead of python3.6? Signed-off-by: Nizamudeen A --- diff --git a/src/cephadm/cephadmlib/daemons/ceph.py b/src/cephadm/cephadmlib/daemons/ceph.py index 55a928351297..d5e87ad94847 100644 --- a/src/cephadm/cephadmlib/daemons/ceph.py +++ b/src/cephadm/cephadmlib/daemons/ceph.py @@ -436,13 +436,13 @@ def get_ceph_mounts_for_type( mounts[cephadm_binary] = '/usr/sbin/cephadm' mounts[ ceph_folder + '/src/ceph-volume/ceph_volume' - ] = '/usr/lib/python3.6/site-packages/ceph_volume' + ] = '/usr/lib/python3.9/site-packages/ceph_volume' mounts[ ceph_folder + '/src/pybind/mgr' ] = '/usr/share/ceph/mgr' mounts[ ceph_folder + '/src/python-common/ceph' - ] = '/usr/lib/python3.6/site-packages/ceph' + ] = '/usr/lib/python3.9/site-packages/ceph' mounts[ ceph_folder + '/monitoring/ceph-mixin/dashboards_out' ] = '/etc/grafana/dashboards/ceph-dashboard' diff --git a/src/pybind/mgr/rook/ci/Dockerfile b/src/pybind/mgr/rook/ci/Dockerfile index a338188195ae..a4a134f03f6d 100644 --- a/src/pybind/mgr/rook/ci/Dockerfile +++ b/src/pybind/mgr/rook/ci/Dockerfile @@ -1,4 +1,4 @@ FROM quay.io/ceph/daemon-base:latest-main COPY ./tmp_build/orchestrator /usr/share/ceph/mgr/orchestrator COPY ./tmp_build/rook /usr/share/ceph/mgr/rook -COPY ./tmp_build/ceph/ /usr/lib/python3.6/site-packages/ceph/ +COPY ./tmp_build/ceph/ /usr/lib/python3.9/site-packages/ceph/