From 6813d5b94b34c700f70b011c9367a172998e72f9 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Fri, 2 Aug 2024 10:19:39 +0200 Subject: [PATCH 1/2] fix: Add libblockdev-s390 to blivet_package_list libblockdev-s390 is available only on s390x architecture so we can't add it as dependency everywhere. --- vars/AlmaLinux_10.yml | 3 +++ vars/AlmaLinux_8.yml | 3 +++ vars/AlmaLinux_9.yml | 3 +++ vars/CentOS_10.yml | 3 +++ vars/CentOS_7.yml | 3 +++ vars/CentOS_8.yml | 3 +++ vars/CentOS_9.yml | 3 +++ vars/Fedora.yml | 3 +++ vars/RedHat_10.yml | 3 +++ vars/RedHat_7.yml | 3 +++ vars/RedHat_8.yml | 3 +++ vars/RedHat_9.yml | 3 +++ vars/Rocky_8.yml | 3 +++ vars/Rocky_9.yml | 3 +++ 14 files changed, 42 insertions(+) diff --git a/vars/AlmaLinux_10.yml b/vars/AlmaLinux_10.yml index be0f630d..abe8f7c5 100644 --- a/vars/AlmaLinux_10.yml +++ b/vars/AlmaLinux_10.yml @@ -9,5 +9,8 @@ blivet_package_list: - xfsprogs - stratisd - stratis-cli + # 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 diff --git a/vars/AlmaLinux_8.yml b/vars/AlmaLinux_8.yml index 45756a96..c635708c 100644 --- a/vars/AlmaLinux_8.yml +++ b/vars/AlmaLinux_8.yml @@ -11,3 +11,6 @@ blivet_package_list: - xfsprogs - stratisd - stratis-cli + # 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' }}" diff --git a/vars/AlmaLinux_9.yml b/vars/AlmaLinux_9.yml index 45756a96..c635708c 100644 --- a/vars/AlmaLinux_9.yml +++ b/vars/AlmaLinux_9.yml @@ -11,3 +11,6 @@ blivet_package_list: - xfsprogs - stratisd - stratis-cli + # 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' }}" diff --git a/vars/CentOS_10.yml b/vars/CentOS_10.yml index be0f630d..abe8f7c5 100644 --- a/vars/CentOS_10.yml +++ b/vars/CentOS_10.yml @@ -9,5 +9,8 @@ blivet_package_list: - xfsprogs - stratisd - stratis-cli + # 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 diff --git a/vars/CentOS_7.yml b/vars/CentOS_7.yml index dc3185cf..8f54e49e 100644 --- a/vars/CentOS_7.yml +++ b/vars/CentOS_7.yml @@ -7,6 +7,9 @@ blivet_package_list: - libblockdev-lvm - libblockdev-mdraid - libblockdev-swap + # 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' }}" # additional options for mkfs when creating a disk volume (whole disk fs) __storage_blivet_diskvolume_mkfs_option_map: ext2: '-F' diff --git a/vars/CentOS_8.yml b/vars/CentOS_8.yml index 45756a96..c635708c 100644 --- a/vars/CentOS_8.yml +++ b/vars/CentOS_8.yml @@ -11,3 +11,6 @@ blivet_package_list: - xfsprogs - stratisd - stratis-cli + # 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' }}" diff --git a/vars/CentOS_9.yml b/vars/CentOS_9.yml index 45756a96..c635708c 100644 --- a/vars/CentOS_9.yml +++ b/vars/CentOS_9.yml @@ -11,3 +11,6 @@ blivet_package_list: - xfsprogs - stratisd - stratis-cli + # 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' }}" diff --git a/vars/Fedora.yml b/vars/Fedora.yml index fe88f8d9..746c4217 100644 --- a/vars/Fedora.yml +++ b/vars/Fedora.yml @@ -8,6 +8,9 @@ blivet_package_list: - libblockdev-swap - stratisd - stratis-cli + # 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: diff --git a/vars/RedHat_10.yml b/vars/RedHat_10.yml index be0f630d..abe8f7c5 100644 --- a/vars/RedHat_10.yml +++ b/vars/RedHat_10.yml @@ -9,5 +9,8 @@ blivet_package_list: - xfsprogs - stratisd - stratis-cli + # 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 diff --git a/vars/RedHat_7.yml b/vars/RedHat_7.yml index dc3185cf..8f54e49e 100644 --- a/vars/RedHat_7.yml +++ b/vars/RedHat_7.yml @@ -7,6 +7,9 @@ blivet_package_list: - libblockdev-lvm - libblockdev-mdraid - libblockdev-swap + # 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' }}" # additional options for mkfs when creating a disk volume (whole disk fs) __storage_blivet_diskvolume_mkfs_option_map: ext2: '-F' diff --git a/vars/RedHat_8.yml b/vars/RedHat_8.yml index 45756a96..c635708c 100644 --- a/vars/RedHat_8.yml +++ b/vars/RedHat_8.yml @@ -11,3 +11,6 @@ blivet_package_list: - xfsprogs - stratisd - stratis-cli + # 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' }}" diff --git a/vars/RedHat_9.yml b/vars/RedHat_9.yml index 45756a96..c635708c 100644 --- a/vars/RedHat_9.yml +++ b/vars/RedHat_9.yml @@ -11,3 +11,6 @@ blivet_package_list: - xfsprogs - stratisd - stratis-cli + # 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' }}" diff --git a/vars/Rocky_8.yml b/vars/Rocky_8.yml index 45756a96..c635708c 100644 --- a/vars/Rocky_8.yml +++ b/vars/Rocky_8.yml @@ -11,3 +11,6 @@ blivet_package_list: - xfsprogs - stratisd - stratis-cli + # 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' }}" diff --git a/vars/Rocky_9.yml b/vars/Rocky_9.yml index 45756a96..c635708c 100644 --- a/vars/Rocky_9.yml +++ b/vars/Rocky_9.yml @@ -11,3 +11,6 @@ blivet_package_list: - xfsprogs - stratisd - stratis-cli + # 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' }}" From dd868c668bae3deffce56d59da2016c083fc774d Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Fri, 2 Aug 2024 10:22:03 +0200 Subject: [PATCH 2/2] fix: Add libblockdev-fs to blivet_package_list Latest blivet on Fedora and RHEL/CentOS 10 uses libblockdev FS plugin for filesystem operations. --- vars/AlmaLinux_10.yml | 1 + vars/CentOS_10.yml | 1 + vars/Fedora.yml | 1 + vars/RedHat_10.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/vars/AlmaLinux_10.yml b/vars/AlmaLinux_10.yml index abe8f7c5..d7eb3f3e 100644 --- a/vars/AlmaLinux_10.yml +++ b/vars/AlmaLinux_10.yml @@ -3,6 +3,7 @@ blivet_package_list: - python3-blivet - libblockdev-crypto - libblockdev-dm + - libblockdev-fs - libblockdev-lvm - libblockdev-mdraid - libblockdev-swap diff --git a/vars/CentOS_10.yml b/vars/CentOS_10.yml index abe8f7c5..d7eb3f3e 100644 --- a/vars/CentOS_10.yml +++ b/vars/CentOS_10.yml @@ -3,6 +3,7 @@ blivet_package_list: - python3-blivet - libblockdev-crypto - libblockdev-dm + - libblockdev-fs - libblockdev-lvm - libblockdev-mdraid - libblockdev-swap diff --git a/vars/Fedora.yml b/vars/Fedora.yml index 746c4217..3f5d80c2 100644 --- a/vars/Fedora.yml +++ b/vars/Fedora.yml @@ -3,6 +3,7 @@ blivet_package_list: - python3-blivet - libblockdev-crypto - libblockdev-dm + - libblockdev-fs - libblockdev-lvm - libblockdev-mdraid - libblockdev-swap diff --git a/vars/RedHat_10.yml b/vars/RedHat_10.yml index abe8f7c5..d7eb3f3e 100644 --- a/vars/RedHat_10.yml +++ b/vars/RedHat_10.yml @@ -3,6 +3,7 @@ blivet_package_list: - python3-blivet - libblockdev-crypto - libblockdev-dm + - libblockdev-fs - libblockdev-lvm - libblockdev-mdraid - libblockdev-swap