Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Add libblockdev s390 and FS plugins to blivet dependencies list #467

Merged
merged 2 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions vars/AlmaLinux_10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ blivet_package_list:
- python3-blivet
- libblockdev-crypto
- libblockdev-dm
- libblockdev-fs
- libblockdev-lvm
- libblockdev-mdraid
- libblockdev-swap
- 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
3 changes: 3 additions & 0 deletions vars/AlmaLinux_8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}"
3 changes: 3 additions & 0 deletions vars/AlmaLinux_9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}"
4 changes: 4 additions & 0 deletions vars/CentOS_10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ blivet_package_list:
- python3-blivet
- libblockdev-crypto
- libblockdev-dm
- libblockdev-fs
- libblockdev-lvm
- libblockdev-mdraid
- libblockdev-swap
- 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
3 changes: 3 additions & 0 deletions vars/CentOS_7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 3 additions & 0 deletions vars/CentOS_8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}"
3 changes: 3 additions & 0 deletions vars/CentOS_9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}"
4 changes: 4 additions & 0 deletions vars/Fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ blivet_package_list:
- python3-blivet
- libblockdev-crypto
- libblockdev-dm
- libblockdev-fs
- libblockdev-lvm
- libblockdev-mdraid
- 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:
Expand Down
4 changes: 4 additions & 0 deletions vars/RedHat_10.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ blivet_package_list:
- python3-blivet
- libblockdev-crypto
- libblockdev-dm
- libblockdev-fs
- libblockdev-lvm
- libblockdev-mdraid
- libblockdev-swap
- 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
3 changes: 3 additions & 0 deletions vars/RedHat_7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
3 changes: 3 additions & 0 deletions vars/RedHat_8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}"
3 changes: 3 additions & 0 deletions vars/RedHat_9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}"
3 changes: 3 additions & 0 deletions vars/Rocky_8.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}"
3 changes: 3 additions & 0 deletions vars/Rocky_9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}"
Loading