From 3a8e7a58b5c8e61a798ee9b88109b9b5a6930d5a Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Wed, 20 Nov 2024 12:36:30 +0100
Subject: [PATCH 1/3] tests: Enable LVM VDO tests on Fedora

VDO is now available in Fedora and the kernel module (now named
"dm-vdo" instead of "kvdo") is now part of the upstream kernel.
---
 tests/tests_create_lvmvdo_then_remove.yml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/tests/tests_create_lvmvdo_then_remove.yml b/tests/tests_create_lvmvdo_then_remove.yml
index 06d3662b..d34f00bb 100644
--- a/tests/tests_create_lvmvdo_then_remove.yml
+++ b/tests/tests_create_lvmvdo_then_remove.yml
@@ -40,19 +40,30 @@
           ansible_facts.packages[blivet_pkg_name[0]][0]['version'] +
           '-' + ansible_facts.packages[blivet_pkg_name[0]][0]['release'] }}"
 
+    - name: Set libblockdev package version
+      set_fact:
+        libblockdev_pkg_version: "{{
+          ansible_facts.packages['libblockdev'][0]['version'] +
+          '-' + ansible_facts.packages['libblockdev'][0]['release'] }}"
+
     - name: Check if kvdo is loadable
-      shell: |
-        set -euo pipefail
-        modprobe --dry-run kvdo
+      command: modprobe --dry-run kvdo
       ignore_errors: true  # noqa ignore-errors
       changed_when: false
       register: __storage_kvdo_loadable
 
+    - name: Check if dm-vdo is loadable
+      command: modprobe --dry-run dm-vdo
+      ignore_errors: true  # noqa ignore-errors
+      changed_when: false
+      register: __storage_dmvdo_loadable
+
     - name: Run tests if VDO is available
       when:
         - blivet_pkg_version is version("3.2.2-10", ">=")
-        - ansible_facts["distribution"] != "Fedora"
-        - __storage_kvdo_loadable is success
+        - ansible_facts["distribution"] != "Fedora" or
+          libblockdev_pkg_version is version("3.1.1-2", ">=")
+        - __storage_kvdo_loadable is success or __storage_dmvdo_loadable is success
       block:
         - name: Get unused disks
           include_tasks: get_unused_disk.yml

From 049a32927d4ea626b9b06579495f4d8e438e8182 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Wed, 20 Nov 2024 12:39:11 +0100
Subject: [PATCH 2/3] fix: Do not enable VDO Copr repository on Fedora

The "vdo" package is now available on all supported versions of
Fedora in the base repository.
---
 vars/Fedora.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/vars/Fedora.yml b/vars/Fedora.yml
index 3f5d80c2..518e2cc9 100644
--- a/vars/Fedora.yml
+++ b/vars/Fedora.yml
@@ -12,10 +12,6 @@ blivet_package_list:
   # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
   # else, it is already brought in as dependency of blivet so it's just no-op here
   - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
-_storage_copr_packages:
-  - repository: "rhawalsh/dm-vdo"
-    packages:
-      - vdo
-      - kmod-vdo
+  - vdo
 _storage_copr_support_packages:
   - dnf-plugins-core

From b78243e00b80e1d39195ae1123bc17a9fd84084b Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Wed, 20 Nov 2024 12:48:52 +0100
Subject: [PATCH 3/3] fix: Install VDO on RHEL/CentOS 10

The package with VDO userspace tools is now available.
---
 vars/RedHat_10.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/vars/RedHat_10.yml b/vars/RedHat_10.yml
index d7eb3f3e..ca4e2f5a 100644
--- a/vars/RedHat_10.yml
+++ b/vars/RedHat_10.yml
@@ -13,5 +13,4 @@ blivet_package_list:
   # XXX libblockdev-s390 is available only on s390 so just add 'libblockdev' everywhere
   # else, it is already brought in as dependency of blivet so it's just no-op here
   - "{{ 'libblockdev-s390' if ansible_architecture == 's390x' else 'libblockdev' }}"
-# vdo not yet available on el10
-#  - vdo
+  - vdo