Merge pull request #39644 from liewegas/cephadm-service-id

cephadm: include service_name in unit.meta file

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --cc src/cephadm/cephadm
Simple merge

diff --cc src/pybind/mgr/cephadm/serve.py
Simple merge

diff --cc src/pybind/mgr/cephadm/tests/test_cephadm.py
Simple merge

diff --cc src/pybind/mgr/orchestrator/_interface.py
index e7dd12e6f272a5a28f91da8810215fb7be3e24cf,0865b00ed33c76687138ac221c9556f82fe69c06..798f70f83c35ae7907adc0c331528f1592102e78
--- 1/src/pybind/mgr/orchestrator/_interface.py
--- 2/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@@ -1422,8 -1434,11 +1441,11 @@@ class DaemonDescription(object)
          out['container_image_id'] = self.container_image_id
          out['container_image_name'] = self.container_image_name
          out['container_image_digests'] = self.container_image_digests
+         out['memory_usage'] = self.memory_usage
+         out['memory_request'] = self.memory_request
+         out['memory_limit'] = self.memory_limit
          out['version'] = self.version
 -        out['status'] = self.status
 +        out['status'] = self.status.value if self.status is not None else None
          out['status_desc'] = self.status_desc
          if self.daemon_type == 'osd':
              out['osdspec_affinity'] = self.osdspec_affinity