Changeset - 6d46b300aa0b
[Not reviewed]
0 4 0
Branko Majic (branko) - 4 years ago 2020-05-06 00:50:31
branko@majic.rs
MAR-152: Drop support for Debian 8 Jessie from the backup_server role.
4 files changed with 1 insertions and 36 deletions:
0 comments (0 inline, 0 general)
docs/rolereference.rst
Show inline comments
 
@@ -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)
 

	
 

	
roles/backup_server/molecule/default/molecule.yml
Show inline comments
 
@@ -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
roles/backup_server/molecule/default/tests/test_default.py
Show inline comments
 
@@ -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):
roles/backup_server/molecule/default/tests/test_parameters_optional.py
Show inline comments
 
@@ -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)
0 comments (0 inline, 0 general)