diff --git a/docs/rolereference.rst b/docs/rolereference.rst index 7fc64b000a183c2725ea7d3fd126e3e09fc5877b..c5a333e1d7598af47302677fc4d30e1cc32f714f 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -2116,7 +2116,6 @@ Distribution compatibility Role is compatible with the following distributions: -- Debian 9 (Stretch) - Debian 10 (Buster) diff --git a/roles/database/meta/main.yml b/roles/database/meta/main.yml index 9cac206d7432f6dbb638068650b6eb40e491b53f..1d926dcdfde3ea2ae05f07cd3a951a709b1943b0 100644 --- a/roles/database/meta/main.yml +++ b/roles/database/meta/main.yml @@ -18,5 +18,4 @@ galaxy_info: platforms: - name: Debian versions: - - 9 - 10 diff --git a/roles/database/molecule/default/molecule.yml b/roles/database/molecule/default/molecule.yml index 0ba3d04667c110d4a7f0a660b7eba13128ff5acd..cac7d5e6914b0f734719542f0e7441787b7003d5 100644 --- a/roles/database/molecule/default/molecule.yml +++ b/roles/database/molecule/default/molecule.yml @@ -14,26 +14,11 @@ lint: platforms: - - name: parameters-mandatory-stretch64 - groups: - - parameters-mandatory - box: debian/contrib-stretch64 - memory: 256 - cpus: 1 - - - name: parameters-optional-stretch64 - groups: - - parameters-optional - - backup-server - box: debian/contrib-stretch64 - memory: 512 - cpus: 1 - - name: parameters-mandatory-buster64 groups: - parameters-mandatory box: debian/contrib-buster64 - memory: 256 + memory: 512 cpus: 1 - name: parameters-optional-buster64 diff --git a/roles/database/molecule/default/tests/test_default.py b/roles/database/molecule/default/tests/test_default.py index e3c262a0f88ffe34bf6f1c139fb818974b8588f2..5c2340e94c4dc8e74fa5670deb31e1b31c4f4412 100644 --- a/roles/database/molecule/default/tests/test_default.py +++ b/roles/database/molecule/default/tests/test_default.py @@ -39,10 +39,7 @@ def test_database_user_permissions(host): # Small difference in usage of backtick (`) instead of single # quote (') when displaying grants for user. - if ansible_distribution_release == "stretch": - expected_usage = "GRANT USAGE ON *.* TO 'testdb'@'localhost' IDENTIFIED BY PASSWORD '*676852B7FAE972722AD20D6E74781D6B1A100544'" - expected_privileges = "GRANT ALL PRIVILEGES ON `testdb`.* TO 'testdb'@'localhost'" - elif ansible_distribution_release == "buster": + if ansible_distribution_release == "buster": expected_usage = "GRANT USAGE ON *.* TO `testdb`@`localhost` IDENTIFIED BY PASSWORD '*676852B7FAE972722AD20D6E74781D6B1A100544'" expected_privileges = "GRANT ALL PRIVILEGES ON `testdb`.* TO `testdb`@`localhost`" else: