From: Sebastian Wagner Date: Fri, 26 Feb 2021 13:21:43 +0000 (+0100) Subject: Merge pull request #39644 from liewegas/cephadm-service-id X-Git-Tag: v17.1.0~2823 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4783a69b96a2ddfad8ee1abba0d8f14e46fc84dc;p=ceph.git Merge pull request #39644 from liewegas/cephadm-service-id cephadm: include service_name in unit.meta file Reviewed-by: Sebastian Wagner --- 4783a69b96a2ddfad8ee1abba0d8f14e46fc84dc diff --cc src/pybind/mgr/orchestrator/_interface.py index e7dd12e6f272,0865b00ed33c..798f70f83c35 --- a/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