From 7d8464587d2d09399ca881ce12aff4713e7f1143 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Tue, 25 Jun 2019 16:46:13 +0200 Subject: [PATCH] add ceph-volume zap fix this is pending review upstream Signed-off-by: Dominik Csapak --- ...vm.zap-fix-cleanup-for-db-partitions.patch | 29 +++++++++++++++++++ patches/series | 1 + 2 files changed, 30 insertions(+) create mode 100644 patches/0008-ceph-volume-lvm.zap-fix-cleanup-for-db-partitions.patch diff --git a/patches/0008-ceph-volume-lvm.zap-fix-cleanup-for-db-partitions.patch b/patches/0008-ceph-volume-lvm.zap-fix-cleanup-for-db-partitions.patch new file mode 100644 index 000000000..df26ecc86 --- /dev/null +++ b/patches/0008-ceph-volume-lvm.zap-fix-cleanup-for-db-partitions.patch @@ -0,0 +1,29 @@ +From 2db844652e8df36adba7ba3b1a334ee583d1a1e1 Mon Sep 17 00:00:00 2001 +From: Dominik Csapak +Date: Tue, 28 May 2019 16:29:21 +0200 +Subject: [PATCH] ceph-volume lvm.zap fix cleanup for db partitions + +this uses the correct type 'db' for db type partitions, else +a block.db parition does not get cleaned up by ceph-volume zap + +Signed-off-by: Dominik Csapak +--- + src/ceph-volume/ceph_volume/devices/lvm/zap.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/ceph-volume/ceph_volume/devices/lvm/zap.py b/src/ceph-volume/ceph_volume/devices/lvm/zap.py +index 328a036152..9a7a103ada 100644 +--- a/src/ceph-volume/ceph_volume/devices/lvm/zap.py ++++ b/src/ceph-volume/ceph_volume/devices/lvm/zap.py +@@ -77,7 +77,7 @@ def ensure_associated_lvs(lvs): + wal_lvs = lvs._filter(lv_tags={'ceph.type': 'wal'}) + backing_devices = [ + (journal_lvs, 'journal'), +- (db_lvs, 'block'), ++ (db_lvs, 'db'), + (wal_lvs, 'wal') + ] + +-- +2.20.1 + diff --git a/patches/series b/patches/series index e66667e33..de9726160 100644 --- a/patches/series +++ b/patches/series @@ -2,3 +2,4 @@ 0002-enable-systemd-targets-by-default.patch 0006-debian-control-add-break-libpvestorage-perl.patch 0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch +0008-ceph-volume-lvm.zap-fix-cleanup-for-db-partitions.patch -- 2.39.2