[PR #7709/0c7b9e50 backport][stable-8] Fix keytool setup on Debian Bookworm (#7712)

Fix keytool setup on Debian Bookworm (#7709)

Fix keytool setup on Debian Bookworm.

(cherry picked from commit 0c7b9e50b5)

Co-authored-by: Felix Fontein <felix@fontein.de>

tests/integration/targets/setup_java_keytool/tasks/main.yml

@@ -16,11 +16,19 @@
       }}
 
 - name: Include OS-specific variables
-  include_vars: '{{ ansible_os_family }}.yml'
+  include_vars: '{{ lookup("first_found", params) }}'
+  vars:
+    params:
+      files:
+        - '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
+        - '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
+        - '{{ ansible_os_family }}.yml'
+      paths:
+        - '{{ role_path }}/vars'
   when: has_java_keytool
 
 - name: Install keytool
   package:
-    name: '{{ keytool_package_name }}'
+    name: '{{ keytool_package_names }}'
   become: true
   when: has_java_keytool

tests/integration/targets/setup_java_keytool/vars/Alpine.yml

@@ -3,4 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-keytool_package_name: openjdk11-jre-headless
+keytool_package_names:
+  - openjdk11-jre-headless

tests/integration/targets/setup_java_keytool/vars/Archlinux.yml

@@ -3,4 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-keytool_package_name: jre11-openjdk-headless
+keytool_package_names:
+  - jre11-openjdk-headless

tests/integration/targets/setup_java_keytool/vars/Debian-12.yml

@@ -0,0 +1,8 @@
+---
+# Copyright (c) Ansible Project
+# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+keytool_package_names:
+  - ca-certificates-java
+  - openjdk-17-jre-headless

tests/integration/targets/setup_java_keytool/vars/Debian.yml

@@ -3,4 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-keytool_package_name: ca-certificates-java
+keytool_package_names:
+  - ca-certificates-java

tests/integration/targets/setup_java_keytool/vars/RedHat.yml

@@ -3,4 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-keytool_package_name: java-11-openjdk-headless
+keytool_package_names:
+  - java-11-openjdk-headless

tests/integration/targets/setup_java_keytool/vars/Suse.yml

@@ -3,4 +3,5 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-keytool_package_name: java-11-openjdk-headless
+keytool_package_names:
+  - java-11-openjdk-headless