From: Adam King <adking@redhat.com>
Date: Mon, 21 Oct 2024 14:59:03 +0000 (-0400)
Subject: cephadm: add python-common/ceph to cephadm zipapp
X-Git-Tag: v20.0.0~724^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b44121f483262beeea4d3b20b7065a313561e48a;p=ceph.git

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>
---

diff --git a/src/cephadm/build.py b/src/cephadm/build.py
index ed39c84e9af52..43bc58a40034c 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: