From c89b5e6609a4c64811ed1669d5b61bc5f327d644 2023-11-30 18:23:12 From: Branko Majic Date: 2023-11-30 18:23:12 Subject: [PATCH] MAR-189: Added support for Debian 11 Bullseye to ldap_client role. --- diff --git a/docs/rolereference.rst b/docs/rolereference.rst index 55ee6b64caec3172fe883310e32d696f5f64ed4e..3f615130c496005415e109259a0c6412a5879741 100644 --- a/docs/rolereference.rst +++ b/docs/rolereference.rst @@ -577,6 +577,7 @@ Distribution compatibility Role is compatible with the following distributions: - Debian 10 (Buster) +- Debian 11 (Bullseye) Examples diff --git a/roles/ldap_client/meta/main.yml b/roles/ldap_client/meta/main.yml index 3c93c39681ef17a15527e14b878e0b883e77f877..97f2435553998389d7b72822316a358954867332 100644 --- a/roles/ldap_client/meta/main.yml +++ b/roles/ldap_client/meta/main.yml @@ -9,3 +9,4 @@ galaxy_info: - name: Debian versions: - 10 + - 11 diff --git a/roles/ldap_client/molecule/default/molecule.yml b/roles/ldap_client/molecule/default/molecule.yml index caa57a3b6b4aaf91d5dafef4a473d8da17e0dbc2..e0e218eda171bd8b2d87e5f4deedf9a8d1acc329 100644 --- a/roles/ldap_client/molecule/default/molecule.yml +++ b/roles/ldap_client/molecule/default/molecule.yml @@ -14,20 +14,34 @@ lint: platforms: - - name: parameters-mandatory-buster64 + - name: parameters-mandatory-buster groups: - parameters-mandatory box: debian/contrib-buster64 memory: 256 cpus: 1 - - name: parameters-optional-buster64 + - name: parameters-optional-buster groups: - parameters-optional box: debian/contrib-buster64 memory: 256 cpus: 1 + - name: parameters-mandatory-bullseye + groups: + - parameters-mandatory + box: debian/bullseye64 + memory: 256 + cpus: 1 + + - name: parameters-optional-bullseye + groups: + - parameters-optional + box: debian/bullseye64 + memory: 256 + cpus: 1 + provisioner: name: ansible config_options: diff --git a/roles/ldap_client/molecule/default/tests/test_default.py b/roles/ldap_client/molecule/default/tests/test_default.py index 8c76327c46a216a633004e1cca99501d416455ec..f1705aacb85582a26f41fc6bbbaa4e9081d49f1d 100644 --- a/roles/ldap_client/molecule/default/tests/test_default.py +++ b/roles/ldap_client/molecule/default/tests/test_default.py @@ -15,6 +15,19 @@ def test_installed_packages(host): assert host.package('ldap-utils').is_installed +def test_ldap_configuration_directory(host): + """ + Tests if LDAP client configuration directory has been created. + """ + + config = host.file('/etc/ldap') + + assert config.is_directory + assert config.user == 'root' + assert config.group == 'root' + assert config.mode == 0o755 + + def test_ldap_configuration_file(host): """ Tests if LDAP configuration files has been deployed with correct diff --git a/roles/ldap_client/tasks/main.yml b/roles/ldap_client/tasks/main.yml index 50869c03be2ea1c8b36c3dd31dcaaeeb5ade1f0d..598d0788758e03c52750d6a1b134a381b9e8aaed 100644 --- a/roles/ldap_client/tasks/main.yml +++ b/roles/ldap_client/tasks/main.yml @@ -5,6 +5,14 @@ name: ldap-utils state: present +- name: Set-up LDAP client configuration directory + file: + path: /etc/ldap/ + state: directory + owner: root + group: root + mode: 0755 + - name: Deploy LDAP client configuration file template: src: ldap.conf.j2