summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam King <adking@redhat.com>2024-10-21 16:59:03 +0200
committerAdam King <adking@redhat.com>2024-10-30 15:09:04 +0100
commitb44121f483262beeea4d3b20b7065a313561e48a (patch)
tree3493336f813cef1299a5e71875ce96e99a82bd0b
parentMerge pull request #60541 from gbregman/main (diff)
downloadceph-b44121f483262beeea4d3b20b7065a313561e48a.tar.xz
ceph-b44121f483262beeea4d3b20b7065a313561e48a.zip
cephadm: add python-common/ceph to cephadm zipapp
We want to use this location for files to be shared between the cephadm binary and cephadm mgr module so it must be included as part of the zipapp Signed-off-by: Adam King <adking@redhat.com>
-rwxr-xr-xsrc/cephadm/build.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/cephadm/build.py b/src/cephadm/build.py
index ed39c84e9af..43bc58a4003 100755
--- a/src/cephadm/build.py
+++ b/src/cephadm/build.py
@@ -269,6 +269,9 @@ def _build(dest, src, config):
mdir.mkdir(parents=True, exist_ok=True)
(mdir / "__init__.py").touch(exist_ok=True)
versioning_vars = config.cli_args.version_vars
+ shutil.copytree(
+ "../python-common/ceph", appdir / "ceph"
+ )
if versioning_vars:
generate_version_file(versioning_vars, mdir / "version.py")
if dinfo: