From 740d3a1891f51bd8b3854104b7d32b8bebac2ba7 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Tue, 18 Jun 2024 09:32:05 -0600
Subject: [PATCH] fix: el10 kdump role should depend on kdump-utils

Cause: The kdump tools in el10 are split into kexec-tools and
kdump-utils.

Consequence: The kdump role does not have all of the packages
required.

Fix: Install both kexec-tools and kdump-utils on el10.

Result: The kdump system role has all of the packages and
tools required at runtime.

Jira issue: https://issues.redhat.com/browse/RHEL-40071
---
 .ostree/packages-runtime-CentOS-10.txt |  1 +
 .ostree/packages-runtime-RedHat-10.txt |  1 +
 tasks/set_vars.yml                     | 15 +++++++++++++++
 vars/CentOS_10.yml                     |  7 +++++++
 vars/RedHat_10.yml                     |  7 +++++++
 5 files changed, 31 insertions(+)
 create mode 100644 .ostree/packages-runtime-CentOS-10.txt
 create mode 100644 .ostree/packages-runtime-RedHat-10.txt
 create mode 100644 vars/CentOS_10.yml
 create mode 100644 vars/RedHat_10.yml

diff --git a/.ostree/packages-runtime-CentOS-10.txt b/.ostree/packages-runtime-CentOS-10.txt
new file mode 100644
index 0000000..25d8374
--- /dev/null
+++ b/.ostree/packages-runtime-CentOS-10.txt
@@ -0,0 +1 @@
+kdump-utils
diff --git a/.ostree/packages-runtime-RedHat-10.txt b/.ostree/packages-runtime-RedHat-10.txt
new file mode 100644
index 0000000..25d8374
--- /dev/null
+++ b/.ostree/packages-runtime-RedHat-10.txt
@@ -0,0 +1 @@
+kdump-utils
diff --git a/tasks/set_vars.yml b/tasks/set_vars.yml
index a0979d4..79e2a34 100644
--- a/tasks/set_vars.yml
+++ b/tasks/set_vars.yml
@@ -16,3 +16,18 @@
     - name: Set flag to indicate system is ostree
       set_fact:
         __kdump_is_ostree: "{{ __ostree_booted_stat.stat.exists }}"
+
+- name: Set platform/version specific variables
+  include_vars: "{{ __vars_file }}"
+  loop:
+    - "{{ ansible_facts['os_family'] }}.yml"
+    - "{{ ansible_facts['distribution'] }}.yml"
+    - >-
+      {{ ansible_facts['distribution'] ~ '_' ~
+      ansible_facts['distribution_major_version'] }}.yml
+    - >-
+      {{ ansible_facts['distribution'] ~ '_' ~
+      ansible_facts['distribution_version'] }}.yml
+  vars:
+    __vars_file: "{{ role_path }}/vars/{{ item }}"
+  when: __vars_file is file
diff --git a/vars/CentOS_10.yml b/vars/CentOS_10.yml
new file mode 100644
index 0000000..c280a44
--- /dev/null
+++ b/vars/CentOS_10.yml
@@ -0,0 +1,7 @@
+---
+__kdump_packages:
+  - grubby
+  - iproute  # for fact gathering for ip facts
+  - kexec-tools
+  - kdump-utils
+  - openssh-clients
diff --git a/vars/RedHat_10.yml b/vars/RedHat_10.yml
new file mode 100644
index 0000000..c280a44
--- /dev/null
+++ b/vars/RedHat_10.yml
@@ -0,0 +1,7 @@
+---
+__kdump_packages:
+  - grubby
+  - iproute  # for fact gathering for ip facts
+  - kexec-tools
+  - kdump-utils
+  - openssh-clients