mgr/cephadm: try to avoid pull when getting container image info

only if use_repo_digest is not set.

The commit ac88200 introduced this possibility to skip pulling, but
doing this unconditionally broke a use case when one was able to have
a ceph image on a floating tag, and was able to upgrade to a new image
pushed to that tag. As using a floating tag is possible only when
use_repo_digest is enabled (the default), now skipping the pull
if use_repo_digest is disabled will not break it anymore.

Signed-off-by: Mykola Golub <mykola.golub@clyso.com>
(cherry picked from commit 4d049880a0effa78b69179694430d8a274829342)

Conflicts:
	src/pybind/mgr/cephadm/serve.py

diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py
index c9ba456c60f720b312f1523167f3e702aa64f33a..0b2854b8050969f5ff4ff3b4a186b7b6e3c9534d 100644 (file)
--- a/src/pybind/mgr/cephadm/serve.py
+++ b/src/pybind/mgr/cephadm/serve.py
@@ -1384,12 +1384,13 @@ class CephadmServe:
                                  json.loads(str(self.mgr.get_store('registry_credentials'))))
 
         j = None
-        try:
-            j = self._run_cephadm_json(host, '', 'inspect-image', [],
-                                             image=image_name, no_fsid=True,
-                                             error_ok=True)
-        except OrchestratorError:
-            pass
+        if not self.mgr.use_repo_digest:
+            try:
+                j = self._run_cephadm_json(host, '', 'inspect-image', [],
+                                                 image=image_name, no_fsid=True,
+                                                 error_ok=True)
+            except OrchestratorError:
+                pass
 
         if not j:
             pullargs: List[str] = []