Add support for RHEL 9 and adjust tests for it

tests/tasks/setup.yml

@@ -13,3 +13,19 @@
     mode: "0755"
   when:
     - ansible_facts['os_family'] == 'Debian'
+
+- name: Define common variables
+  set_fact:
+    main_sshd_config: /etc/ssh/sshd_config
+    main_sshd_config_name: sshd_config
+    main_sshd_config_path: /etc/ssh/
+
+- name: Define specific variables
+  set_fact:
+    main_sshd_config: /etc/ssh/sshd_config.d/00-ansible_system_role.conf
+    main_sshd_config_name: 00-ansible_system_role.conf
+    main_sshd_config_path: /etc/ssh/sshd_config.d/
+  when: >
+    ansible_facts['distribution'] == 'Fedora' or
+    (ansible_facts['distribution'] == 'RedHat' and
+     ansible_facts['distribution_major_version']|int > 8)

tests/tests_alternative_file.yml

@@ -60,13 +60,6 @@
         sshd_PasswordAuthentication: no
 
     - name: Verify the options are correctly set
-      vars:
-        main_sshd_config: >-
-          {{
-            "/etc/ssh/sshd_config.d/00-ansible_system_role.conf"
-            if ansible_facts['distribution'] == 'Fedora'
-            else "/etc/ssh/sshd_config"
-          }}
       block:
         - meta: flush_handlers
 

tests/tests_alternative_file_role.yml

@@ -72,14 +72,10 @@
       - /etc/ssh/sshd_config_custom
       - /etc/ssh/sshd_config_custom_second
   tasks:
+    - name: Setup variables
+      include_tasks: tasks/setup.yml
+
     - name: Verify the options are correctly set
-      vars:
-        main_sshd_config: >-
-          {{
-            "/etc/ssh/sshd_config.d/00-ansible_system_role.conf"
-            if ansible_facts['distribution'] == 'Fedora'
-            else "/etc/ssh/sshd_config"
-          }}
       block:
         - meta: flush_handlers
 

tests/tests_backup.yml

@@ -4,18 +4,6 @@
     __sshd_test_backup_files:
       - /etc/ssh/sshd_config
       - /etc/ssh/sshd_config.d/00-ansible_system_role.conf
-    main_sshd_config: >-
-      {{
-        "00-ansible_system_role.conf"
-        if ansible_facts['distribution'] == 'Fedora'
-        else "sshd_config"
-      }}
-    main_sshd_config_path: >-
-      {{
-        "/etc/ssh/sshd_config.d/"
-        if ansible_facts['distribution'] == 'Fedora'
-        else "/etc/ssh/"
-      }}
   tasks:
     - name: Backup configuration files
       include_tasks: tasks/backup.yml
@@ -23,7 +11,7 @@
     - name: Find old backups files
       find:
         paths: "{{ main_sshd_config_path }}"
-        patterns: "{{ main_sshd_config }}.*@*~"
+        patterns: "{{ main_sshd_config_name }}.*@*~"
       register: backup_files
 
     - name: Remove old backup files
@@ -41,7 +29,7 @@
     - name: Find new backups files
       find:
         paths: "{{ main_sshd_config_path }}"
-        patterns: "{{ main_sshd_config }}.*@*~"
+        patterns: "{{ main_sshd_config_name }}.*@*~"
       register: no_backup
 
     - name: Configure sshd again with different configuration and with backup
@@ -54,7 +42,7 @@
     - name: Find new backups files
       find:
         paths: "{{ main_sshd_config_path }}"
-        patterns: "{{ main_sshd_config }}.*@*~"
+        patterns: "{{ main_sshd_config_name }}.*@*~"
       register: new_backup
 
     - name: Verify the backup was not done in the first attempt, but in the second one

tests/tests_hostkeys.yml

@@ -39,13 +39,6 @@
             - /tmp/ssh_host_rsa_key2
 
     - name: Verify the options are correctly set
-      vars:
-        main_sshd_config: >-
-          {{
-            "/etc/ssh/sshd_config.d/00-ansible_system_role.conf"
-            if ansible_facts['distribution'] == 'Fedora'
-            else "/etc/ssh/sshd_config"
-          }}
       block:
         - meta: flush_handlers
 

tests/tests_hostkeys_role.yml

@@ -46,14 +46,10 @@
       - /etc/ssh/sshd_config.d/00-ansible_system_role.conf
       - /tmp/ssh_host_rsa_key2
   tasks:
+    - name: Setup variables
+      include_tasks: tasks/setup.yml
+
     - name: Verify the options are correctly set
-      vars:
-        main_sshd_config: >-
-          {{
-            "/etc/ssh/sshd_config.d/00-ansible_system_role.conf"
-            if ansible_facts['distribution'] == 'Fedora'
-            else "/etc/ssh/sshd_config"
-          }}
       block:
         - meta: flush_handlers
 

tests/tests_match.yml

@@ -34,13 +34,6 @@
             AllowTcpForwarding: yes
 
     - name: Verify the options are correctly set
-      vars:
-        main_sshd_config: >-
-          {{
-            "/etc/ssh/sshd_config.d/00-ansible_system_role.conf"
-            if ansible_facts['distribution'] == 'Fedora'
-            else "/etc/ssh/sshd_config"
-          }}
       block:
         - meta: flush_handlers
 

tests/tests_match_iterate.yml

@@ -32,13 +32,6 @@
             AllowTcpForwarding: yes
 
     - name: Verify the options are correctly set
-      vars:
-        main_sshd_config: >-
-          {{
-            "/etc/ssh/sshd_config.d/00-ansible_system_role.conf"
-            if ansible_facts['distribution'] == 'Fedora'
-            else "/etc/ssh/sshd_config"
-          }}
       block:
         - meta: flush_handlers
 

tests/tests_precedence.yml

@@ -27,13 +27,6 @@
         sshd_HostKey: /tmp/ssh_host_rsa_key
 
     - name: Verify the options are correctly set
-      vars:
-        main_sshd_config: >-
-          {{
-            "/etc/ssh/sshd_config.d/00-ansible_system_role.conf"
-            if ansible_facts['distribution'] == 'Fedora'
-            else "/etc/ssh/sshd_config"
-          }}
       block:
         - meta: flush_handlers
 

tests/tests_sysconfig.yml

@@ -77,6 +77,7 @@
       when:
         - ansible_facts['os_family'] == "RedHat"
         - ansible_facts['distribution'] != 'Fedora'
+        - ansible_facts['distribution_major_version']|int < 9
 
     - name: "Restore configuration files"
       include_tasks: tasks/restore.yml

vars/RedHat_9.yml

@@ -0,0 +1,13 @@
+---
+sshd_packages:
+  - openssh
+  - openssh-server
+sshd_sftp_server: /usr/libexec/openssh/sftp-server
+# RHEL 9 ships with drop-in directory support so we touch
+# just included file with highest priority by default and have
+# empty defaults
+__sshd_config_file: /etc/ssh/sshd_config.d/00-ansible_system_role.conf
+__sshd_defaults:
+__sshd_os_supported: yes
+__sshd_hostkey_group: ssh_keys
+__sshd_hostkey_mode: "0640"