From 3e0e1609d18c8ef35b104de786a203ec2e36c4a6 Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Mon, 18 Jul 2022 16:40:22 -0400
Subject: [PATCH] ansible: Add Ubuntu 22.04 support to lttng-modules role

Change-Id: I2853e0cfd5613c8da5ea276490dcf8dc77b79acb
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
---
 .../ansible/roles/lttng-modules/tasks/main.yml     | 13 ++++++-------
 .../ansible/roles/lttng-modules/vars/Alpine.yml    |  4 +---
 .../ansible/roles/lttng-modules/vars/RedHat.yml    |  6 +-----
 .../ansible/roles/lttng-modules/vars/Suse.yml      |  4 +---
 .../vars/{Debian.yml => Ubuntu-18.yml}             | 14 +++++++-------
 .../ansible/roles/lttng-modules/vars/Ubuntu-22.yml | 12 ++++++++++++
 6 files changed, 28 insertions(+), 25 deletions(-)
 rename automation/ansible/roles/lttng-modules/vars/{Debian.yml => Ubuntu-18.yml} (86%)
 create mode 100644 automation/ansible/roles/lttng-modules/vars/Ubuntu-22.yml

diff --git a/automation/ansible/roles/lttng-modules/tasks/main.yml b/automation/ansible/roles/lttng-modules/tasks/main.yml
index 3c7e0fd..809110a 100644
--- a/automation/ansible/roles/lttng-modules/tasks/main.yml
+++ b/automation/ansible/roles/lttng-modules/tasks/main.yml
@@ -1,16 +1,15 @@
 ---
 # Include variables and define needed variables.
 - name: Include OS-specific variables.
-  include_vars: "{{ ansible_os_family }}.yml"
-
-- name: Define lttng_modules_packages.
-  set_fact:
-    lttng_modules_packages: "{{ __lttng_modules_packages | list }}"
-  when: lttng_modules_packages is not defined
+  include_vars: "{{ item }}"
+  with_first_found:
+    - "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"
+    - "{{ ansible_distribution }}.yml"
+    - "{{ ansible_os_family }}.yml"
 
 # Setup/install tasks.
 - include: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+  when: ansible_os_family in ['RedHat', 'Rocky']
 
 - include: setup-Debian.yml
   when: ansible_os_family == 'Debian'
diff --git a/automation/ansible/roles/lttng-modules/vars/Alpine.yml b/automation/ansible/roles/lttng-modules/vars/Alpine.yml
index 571d300..69eb652 100644
--- a/automation/ansible/roles/lttng-modules/vars/Alpine.yml
+++ b/automation/ansible/roles/lttng-modules/vars/Alpine.yml
@@ -1,6 +1,4 @@
 ---
-__lttng_modules_packages:
-#  - kernel-wedge
+lttng_modules_packages:
   - libelf-dev
   - bc
-#  - gcc-4.9
diff --git a/automation/ansible/roles/lttng-modules/vars/RedHat.yml b/automation/ansible/roles/lttng-modules/vars/RedHat.yml
index a5ce339..75a3db7 100644
--- a/automation/ansible/roles/lttng-modules/vars/RedHat.yml
+++ b/automation/ansible/roles/lttng-modules/vars/RedHat.yml
@@ -1,8 +1,4 @@
 ---
-__lttng_modules_packages:
-#  - kernel-wedge
+lttng_modules_packages:
   - elfutils-devel
   - bc
-#  - s3cmd
-#  - u-boot-tools
-#  - module-init-tools
diff --git a/automation/ansible/roles/lttng-modules/vars/Suse.yml b/automation/ansible/roles/lttng-modules/vars/Suse.yml
index 7cd1bd1..bc2b5a8 100644
--- a/automation/ansible/roles/lttng-modules/vars/Suse.yml
+++ b/automation/ansible/roles/lttng-modules/vars/Suse.yml
@@ -1,6 +1,4 @@
 ---
-__lttng_modules_packages:
-#  - kernel-wedge
+lttng_modules_packages:
   - libelf-devel
   - bc
-#  - gcc-4.9
diff --git a/automation/ansible/roles/lttng-modules/vars/Debian.yml b/automation/ansible/roles/lttng-modules/vars/Ubuntu-18.yml
similarity index 86%
rename from automation/ansible/roles/lttng-modules/vars/Debian.yml
rename to automation/ansible/roles/lttng-modules/vars/Ubuntu-18.yml
index 17208b7..4ba0692 100644
--- a/automation/ansible/roles/lttng-modules/vars/Debian.yml
+++ b/automation/ansible/roles/lttng-modules/vars/Ubuntu-18.yml
@@ -1,14 +1,14 @@
 ---
-__lttng_modules_packages:
-  - kernel-wedge
-  - libelf-dev
+lttng_modules_packages:
   - bc
+  - dctrl-tools
+  - dwarves
   - gcc-4.8
   - gcc-5
+  - kernel-wedge
+  - libelf-dev
+  - liblz4-tool
+  - module-init-tools
   - s3cmd
   - u-boot-tools
-  - module-init-tools
-  - liblz4-tool
-  - dwarves
-  - dctrl-tools
   - zstd
diff --git a/automation/ansible/roles/lttng-modules/vars/Ubuntu-22.yml b/automation/ansible/roles/lttng-modules/vars/Ubuntu-22.yml
new file mode 100644
index 0000000..766e482
--- /dev/null
+++ b/automation/ansible/roles/lttng-modules/vars/Ubuntu-22.yml
@@ -0,0 +1,12 @@
+---
+lttng_modules_packages:
+  - bc
+  - dctrl-tools
+  - dwarves
+  - kernel-wedge
+  - kmod
+  - libelf-dev
+  - liblz4-tool
+  - s3cmd
+  - u-boot-tools
+  - zstd
-- 
2.34.1