mgr/cephadm: include container_image_digests in inventory

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 9f61c94ae7d56f0b12d753642e031fcd5cd9d145)

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index f988295fda04aff8c6f75686a51bb6904f679034..9c91c743011c8dc94b7ca7c73f31c622ad4f66de 100644 (file)
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -261,6 +261,7 @@ class CephadmServe:
                 sd.container_id = sd.container_id[0:12]
             sd.container_image_name = d.get('container_image_name')
             sd.container_image_id = d.get('container_image_id')
+            sd.container_image_digests = d.get('container_image_digests')
             sd.version = d.get('version')
             if sd.daemon_type == 'osd':
                 sd.osdspec_affinity = self.mgr.osd_service.get_osdspec_affinity(sd.daemon_id)

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index 6034e219daf0b8887e8f715a9164c8b5a0e1d600..f8f2e702fcf872b8bb4638510c60d3ca66d1abdd 100644 (file)
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -1272,6 +1272,7 @@ class DaemonDescription(object):
                  container_id: Optional[str] = None,
                  container_image_id: Optional[str] = None,
                  container_image_name: Optional[str] = None,
+                 container_image_digests: Optional[List[str]] = None,
                  version: Optional[str] = None,
                  status: Optional[int] = None,
                  status_desc: Optional[str] = None,
@@ -1291,8 +1292,9 @@ class DaemonDescription(object):
         # justify having the container_id (runtime id) and container_image
         # (image name)
         self.container_id = container_id                  # runtime id
-        self.container_image_id = container_image_id      # image hash
+        self.container_image_id = container_image_id      # image id locally
         self.container_image_name = container_image_name  # image friendly name
+        self.container_image_digests = container_image_digests  # reg hashes
 
         # The type of service (osd, mon, mgr, etc.)
         self.daemon_type = daemon_type
@@ -1409,6 +1411,7 @@ class DaemonDescription(object):
         out['container_id'] = self.container_id
         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['version'] = self.version
         out['status'] = self.status
         out['status_desc'] = self.status_desc