diff -Nru ceph-iscsi-3.4/debian/changelog ceph-iscsi-3.4/debian/changelog --- ceph-iscsi-3.4/debian/changelog 2022-03-15 10:37:28.000000000 +0000 +++ ceph-iscsi-3.4/debian/changelog 2022-06-14 19:13:52.000000000 +0000 @@ -1,3 +1,11 @@ +ceph-iscsi (3.4-0ubuntu2.2) focal; urgency=medium + + * d/p/support-blocklist-syntax.patch: Fix issue with newer Ceph + clusters updating their output to blocklist instead of + blacklist (LP: #1969775). + + -- Chris MacNaughton Tue, 14 Jun 2022 19:13:52 +0000 + ceph-iscsi (3.4-0ubuntu2.1) focal; urgency=medium * d/p/ceph-rm-blacklist-decode.patch: Fix issue with checking for diff -Nru ceph-iscsi-3.4/debian/patches/series ceph-iscsi-3.4/debian/patches/series --- ceph-iscsi-3.4/debian/patches/series 2022-03-15 10:19:10.000000000 +0000 +++ ceph-iscsi-3.4/debian/patches/series 2022-06-14 19:13:49.000000000 +0000 @@ -1,3 +1,4 @@ 0001-Replace-etc-sysconfig-ceph-by-etc-default-ceph-in-se.patch ubuntu-support.patch ceph-rm-blacklist-decode.patch +support-blocklist-syntax.patch diff -Nru ceph-iscsi-3.4/debian/patches/support-blocklist-syntax.patch ceph-iscsi-3.4/debian/patches/support-blocklist-syntax.patch --- ceph-iscsi-3.4/debian/patches/support-blocklist-syntax.patch 1970-01-01 00:00:00.000000000 +0000 +++ ceph-iscsi-3.4/debian/patches/support-blocklist-syntax.patch 2022-06-14 19:12:50.000000000 +0000 @@ -0,0 +1,14 @@ +Index: ceph-iscsi-3.4/ceph_iscsi_config/gateway.py +=================================================================== +--- ceph-iscsi-3.4.orig/ceph_iscsi_config/gateway.py ++++ ceph-iscsi-3.4/ceph_iscsi_config/gateway.py +@@ -43,7 +43,8 @@ class CephiSCSIGateway(object): + client_name=conf.cluster_client_name, + cephconf=conf.cephconf), + stderr=subprocess.STDOUT, shell=True) +- if (b"un-blacklisting" in result) or (b"isn't blacklisted" in result): ++ if (b"un-blacklisting" in result) or (b"isn't blacklisted" in result) or \ ++ (b"un-blocklisting" in result) or (b"isn't blocklisted" in result): + self.logger.info("Successfully removed blacklist entry") + return True + else: