From 6d46b300aa0b7adee37ce84a864d9b80299273c3 2020-05-06 00:50:31
From: Branko Majic <branko@majic.rs>
Date: 2020-05-06 00:50:31
Subject: [PATCH] MAR-152: Drop support for Debian 8 Jessie from the backup_server role.

---

diff --git a/docs/rolereference.rst b/docs/rolereference.rst
index 929720baef249e2eccd507ec62fe3eb04cae4162..c121760b2991f87a53325fc4107cf4ec4064412d 100644
--- a/docs/rolereference.rst
+++ b/docs/rolereference.rst
@@ -2149,7 +2149,6 @@ Parameters
   Defines host keys used for the dedicated OpenSSH server instance for
   backup. Key values that must be provided are:
 
-  - **dsa** (only on Debian Jessie)
   - **rsa**
   - **ed25519**
   - **ecdsa**
@@ -2169,7 +2168,6 @@ Distribution compatibility
 
 Role is compatible with the following distributions:
 
-- Debian 8 (Jessie)
 - Debian 9 (Stretch)
 
 
diff --git a/roles/backup_server/molecule/default/molecule.yml b/roles/backup_server/molecule/default/molecule.yml
index 1a0463a7a9577da7dc97515a6c786e03cb9d245b..47756c86e4c0a74f5aa1527919cf8aacc882e3e5 100644
--- a/roles/backup_server/molecule/default/molecule.yml
+++ b/roles/backup_server/molecule/default/molecule.yml
@@ -14,30 +14,6 @@ lint:
 
 platforms:
 
-  - name: parameters-mandatory-jessie64
-    groups:
-      - parameters-mandatory
-    box: debian/contrib-jessie64
-    memory: 256
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.10
-        network_name: private_network
-        type: static
-
-  - name: parameters-optional-jessie64
-    groups:
-      - parameters-optional
-    box: debian/contrib-jessie64
-    memory: 256
-    cpus: 1
-    interfaces:
-      - auto_config: true
-        ip: 10.31.127.11
-        network_name: private_network
-        type: static
-
   - name: parameters-mandatory-stretch64
     groups:
       - parameters-mandatory
diff --git a/roles/backup_server/molecule/default/tests/test_default.py b/roles/backup_server/molecule/default/tests/test_default.py
index e8b13fe049ef81e6981e00716dbc9506aa564c76..eaca91ed06efbae0b6a1e0e521f535411cceccd3 100644
--- a/roles/backup_server/molecule/default/tests/test_default.py
+++ b/roles/backup_server/molecule/default/tests/test_default.py
@@ -80,8 +80,6 @@ def test_backup_ssh_server_configuration(host):
 
     with host.sudo():
 
-        ansible_facts = host.ansible("setup")["ansible_facts"]
-
         config_file = host.file('/etc/ssh-backup/sshd_config')
 
         assert config_file.is_file
@@ -98,8 +96,6 @@ def test_backup_ssh_server_configuration(host):
         assert "HostKey /etc/ssh-backup/ssh_host_rsa_key" in config_file.content
         assert "HostKey /etc/ssh-backup/ssh_host_ecdsa_key" in config_file.content
         assert "HostKey /etc/ssh-backup/ssh_host_ed25519_key" in config_file.content
-        if ansible_facts['ansible_distribution_release'] == 'jessie':
-            assert "HostKey /etc/ssh-backup/ssh_host_dsa_key" in config_file.content
 
 
 def test_backup_ssh_server_keys(host):
diff --git a/roles/backup_server/molecule/default/tests/test_parameters_optional.py b/roles/backup_server/molecule/default/tests/test_parameters_optional.py
index 0e30ff5d70f7fdb7fe6424e99fe6695c8bc59b05..9eeee279aa7521d64036f679c32f792be5a4825f 100644
--- a/roles/backup_server/molecule/default/tests/test_parameters_optional.py
+++ b/roles/backup_server/molecule/default/tests/test_parameters_optional.py
@@ -213,12 +213,7 @@ def test_backup_ssh_service_key_fingerprints(host):
     in use.
     """
 
-    ansible_facts = host.ansible("setup")["ansible_facts"]
-
-    if ansible_facts['ansible_distribution_release'] == 'jessie':
-        key_types = ['ssh-dss', 'ssh-rsa', 'ssh-ed25519', 'ecdsa-sha2-nistp256']
-    elif ansible_facts['ansible_distribution_release'] == 'stretch':
-        key_types = ['ssh-rsa', 'ssh-ed25519', 'ecdsa-sha2-nistp256']
+    key_types = ['ssh-rsa', 'ssh-ed25519', 'ecdsa-sha2-nistp256']
 
     # Extract first non-IPv6 IP. Crude test, but it should work.
     remote_ip = next(a for a in host.interface("eth1").addresses if ":" not in a)