Changeset - 638005e20082
[Not reviewed]
0 4 0
Branko Majic (branko) - 9 months ago 2023-08-10 00:21:32
branko@majic.rs
MAR-181: Drop support Debian 9 Stretch from mail_forwarder role:

- Switch to using IPs from VirtualBox default allowed host-only
network subnets.
- Use Debian Buster for helper machines.
4 files changed with 12 insertions and 53 deletions:
0 comments (0 inline, 0 general)
docs/rolereference.rst
Show inline comments
 
@@ -1371,7 +1371,6 @@ Distribution compatibility
 

	
 
Role is compatible with the following distributions:
 

	
 
- Debian 9 (Stretch)
 
- Debian 10 (Buster)
 

	
 

	
roles/mail_forwarder/meta/main.yml
Show inline comments
 
@@ -11,5 +11,4 @@ galaxy_info:
 
  platforms:
 
    - name: Debian
 
      versions:
 
        - 9
 
        - 10
roles/mail_forwarder/molecule/default/molecule.yml
Show inline comments
 
@@ -18,12 +18,12 @@ platforms:
 
    groups:
 
      - mail-servers
 
      - helper
 
    box: debian/contrib-stretch64
 
    box: debian/contrib-buster64
 
    memory: 256
 
    cpus: 1
 
    interfaces:
 
      - auto_config: true
 
        ip: 10.31.127.10
 
        ip: 192.168.56.10
 
        network_name: private_network
 
        type: static
 

	
 
@@ -31,48 +31,12 @@ platforms:
 
    groups:
 
      - clients
 
      - helper
 
    box: debian/contrib-stretch64
 
    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
 
    box: debian/contrib-stretch64
 
    memory: 256
 
    cpus: 1
 
    interfaces:
 
      - auto_config: true
 
        ip: 10.31.127.30
 
        network_name: private_network
 
        type: static
 

	
 
  - name: parameters-optional-stretch64
 
    groups:
 
      - parameters-optional
 
    box: debian/contrib-stretch64
 
    memory: 256
 
    cpus: 1
 
    interfaces:
 
      - auto_config: true
 
        ip: 10.31.127.31
 
        network_name: private_network
 
        type: static
 

	
 
  - name: parameters-no-incoming-stretch64
 
    groups:
 
      - parameters-no-incoming
 
    box: debian/contrib-stretch64
 
    box: debian/contrib-buster64
 
    memory: 256
 
    cpus: 1
 
    interfaces:
 
      - auto_config: true
 
        ip: 10.31.127.32
 
        ip: 192.168.56.11
 
        network_name: private_network
 
        type: static
 

	
 
@@ -84,7 +48,7 @@ platforms:
 
    cpus: 1
 
    interfaces:
 
      - auto_config: true
 
        ip: 10.31.127.20
 
        ip: 192.168.56.20
 
        network_name: private_network
 
        type: static
 

	
 
@@ -96,7 +60,7 @@ platforms:
 
    cpus: 1
 
    interfaces:
 
      - auto_config: true
 
        ip: 10.31.127.21
 
        ip: 192.168.56.21
 
        network_name: private_network
 
        type: static
 

	
 
@@ -108,7 +72,7 @@ platforms:
 
    cpus: 1
 
    interfaces:
 
      - auto_config: true
 
        ip: 10.31.127.22
 
        ip: 192.168.56.22
 
        network_name: private_network
 
        type: static
 

	
roles/mail_forwarder/molecule/default/prepare.yml
Show inline comments
 
@@ -64,14 +64,11 @@
 
        mode: 0644
 
        state: present
 
      with_dict:
 
        10.31.127.10: "mail-server domain1"
 
        10.31.127.11: "client1"
 
        10.31.127.30: "parameters-mandatory-stretch64"
 
        10.31.127.31: "parameters-optional-stretch64"
 
        10.31.127.32: "parameters-no-incoming-stretch64"
 
        10.31.127.20: "parameters-mandatory-buster64"
 
        10.31.127.21: "parameters-optional-buster64"
 
        10.31.127.22: "parameters-no-incoming-buster64"
 
        192.168.56.10: "mail-server domain1"
 
        192.168.56.11: "client1"
 
        192.168.56.20: "parameters-mandatory-buster64"
 
        192.168.56.21: "parameters-optional-buster64"
 
        192.168.56.22: "parameters-no-incoming-buster64"
 

	
 
    - name: Install tools for testing
 
      apt:
0 comments (0 inline, 0 general)