From ea080e669a83bc2f7478587ef5f4c6a658738a62 Mon Sep 17 00:00:00 2001
From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Tue, 14 Jul 2020 15:11:46 +0200
Subject: [PATCH] cephadm: also retry on digest mismatch

Fixes: https://tracker.ceph.com/issues/46534
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---
 src/cephadm/cephadm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index dd2c6b82628..13511000e27 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2299,12 +2299,13 @@ def command_pull():
 
 
 def _pull_image(image):
-    # type: () -> None
+    # type: (str) -> None
     logger.info('Pulling container image %s...' % image)
 
     ignorelist = [
         "error creating read-write layer with ID",
         "net/http: TLS handshake timeout",
+        "Digest did not match, expected",
     ]
 
     cmd = [container_path, 'pull', image]
-- 
2.47.3