diff --git a/docs/rolereference.rst b/docs/rolereference.rst index 85dcf4448b7a4c61511ffbc7010aab1cb0fd3190..2b7e770999a833476c08499d4af61b32f5bf7074 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -130,7 +130,6 @@ Distribution compatibility Role is compatible with the following distributions: -- Debian 9 (Stretch) - Debian 10 (Buster) diff --git a/roles/preseed/meta/main.yml b/roles/preseed/meta/main.yml index 6c1a5eade593086cd3b941b653035fb22e26169b..d8a3ce6dc0a2c3161a24ec63a91e9c8297666420 100644 --- a/roles/preseed/meta/main.yml +++ b/roles/preseed/meta/main.yml @@ -8,5 +8,4 @@ galaxy_info: platforms: - name: Debian versions: - - 9 - 10 diff --git a/roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml b/roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml index f0caf7361921a87ee06b2b878d0ed6c754e21db1..ad321e952b60f332adb015213fa57e80fb6a13c4 100644 --- a/roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml +++ b/roles/preseed/molecule/default/group_vars/parameters-optional-with-overrides.yml @@ -3,24 +3,6 @@ ansible_key: MY_ANSIBLE_KEY preseed_directory: "/tmp/preseed_files/" preseed_server_overrides: - parameters-optional-with-overrides-stretch64: - country: RS - dns: 1.1.1.1 - domain: example.com - gateway: 2.2.2.2 - hostname: testing - ip: 3.3.3.3 - keymap: sv - language: sr - locale: en_UK.UTF-8 - mirror_directory: / - mirror_hostname: ftp.de.debian.org - mirror_proxy: http://proxy.local - netmask: 255.255.0.0 - network_auto: false - network_interface: eth1 - root_password: myrootpassword - timezone: Europe/Belgrade parameters-optional-with-overrides-buster64: country: RS dns: 1.1.1.1 diff --git a/roles/preseed/molecule/default/molecule.yml b/roles/preseed/molecule/default/molecule.yml index 1a4e6884a6a4c41a7f7f6baccd15b3f3a77312f9..5c250abffe6f3b3e7fefdd47ba6cee3cde440e7d 100644 --- a/roles/preseed/molecule/default/molecule.yml +++ b/roles/preseed/molecule/default/molecule.yml @@ -14,27 +14,6 @@ lint: platforms: - - name: parameters-mandatory-stretch64 - groups: - - parameters-mandatory - box: debian/contrib-stretch64 - memory: 256 - cpus: 1 - - - name: parameters-optional-stretch64 - groups: - - parameters-optional - box: debian/contrib-stretch64 - memory: 256 - cpus: 1 - - - name: parameters-optional-with-overrides-stretch64 - groups: - - parameters-optional-with-overrides - box: debian/contrib-stretch64 - memory: 256 - cpus: 1 - - name: parameters-mandatory-buster64 groups: - parameters-mandatory diff --git a/roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py b/roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py index f43b05e5d1eaf0c3aabe2c2cf56e39ba1f8a8972..b8392391f0df3eda2ff41bb4e334926ba2a53dae 100644 --- a/roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py +++ b/roles/preseed/molecule/default/tests/test_parameters_optional_with_overrides.py @@ -10,7 +10,6 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( @pytest.mark.parametrize("distribution_release", [ - "stretch", "buster" ]) def test_preseed_configuration_file_content_host_without_overrides(host, distribution_release): @@ -46,7 +45,6 @@ d-i netcfg/get_domain string ignored-value""" in preseed_file_content @pytest.mark.parametrize("distribution_release", [ - "stretch", "buster" ]) def test_preseed_configuration_file_content_host_with_overrides(host, distribution_release): diff --git a/roles/preseed/templates/preseed.cfg.j2 b/roles/preseed/templates/preseed.cfg.j2 index 7a6eb9a0a932f141ad84c502437249c0bad9dc41..ca8ee59b2a24d7dc8352a01dfd58f5f7f3348e75 100644 --- a/roles/preseed/templates/preseed.cfg.j2 +++ b/roles/preseed/templates/preseed.cfg.j2 @@ -1,7 +1,7 @@ {% set overrides = preseed_server_overrides[item] | default({}) %} {% set network_auto = overrides["network_auto"] | default(preseed_network_auto) %} # -# Pressed configuration file for Debian Stretch installation for server {{ item }}. +# Pressed configuration file for Debian installation for server {{ item }}. #