From 7b7dc7ec55320fcc88f422ebd5d8d956a7d04f3a Mon Sep 17 00:00:00 2001
From: Frode Nordahl <frode.nordahl@canonical.com>
Date: Thu, 28 Mar 2019 17:25:46 +0100
Subject: [PATCH] charm_tests/ceph/rbd_mirror: Workaround upstream Ceph
 Luminous bug

Fixes #208
---
 zaza/charm_tests/ceph/rbd_mirror/tests.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/zaza/charm_tests/ceph/rbd_mirror/tests.py b/zaza/charm_tests/ceph/rbd_mirror/tests.py
index 1c03ba4..8b94db5 100644
--- a/zaza/charm_tests/ceph/rbd_mirror/tests.py
+++ b/zaza/charm_tests/ceph/rbd_mirror/tests.py
@@ -97,7 +97,9 @@ class CephRBDMirrorBase(test_utils.OpenStackBaseTest):
                         break
                     if check_entries_behind_master:
                         m = rep.match(image['description'])
-                        if m and m.group(1) != '0':
+                        # NOTE(fnordahl): Tactical fix for upstream Ceph
+                        # Luminous bug https://tracker.ceph.com/issues/23516
+                        if m and int(m.group(1)) > 42:
                             logging.info('entries_behind_master={}'
                                          .format(m.group(1)))
                             break