From 0255167ebb5e8986731c2d5846dd5c8ff9688ef5 2018-08-02 11:00:47
From: Branko Majic <branko@majic.rs>
Date: 2018-08-02 11:00:47
Subject: [PATCH] MAR-132: Fixed creation of test LDAP entries mail_server role tests:

- Do not use the ldap_entries option of the ldap_server role.
- Invoke the ldap_entry and ldap_attr modules directly.

---

diff --git a/roles/mail_server/molecule/default/host_vars/ldap-server.yml b/roles/mail_server/molecule/default/host_vars/ldap-server.yml
index 3614a2a2ecc3c62c3cb9e10357ef507daa902be3..9d20c3aece6ad6d38e4149ca47a8d5011d86c8b4 100644
--- a/roles/mail_server/molecule/default/host_vars/ldap-server.yml
+++ b/roles/mail_server/molecule/default/host_vars/ldap-server.yml
@@ -2,72 +2,6 @@
 
 # ldap_server role
 ldap_admin_password: admin
-ldap_entries:
-
-  # Users
-  - dn: uid=john,ou=people,dc=local
-    attributes:
-      objectClass:
-        - inetOrgPerson
-        - simpleSecurityObject
-      userPassword: johnpassword
-      uid: john
-      cn: John Doe
-      sn: Doe
-      mail: john.doe@domain1
-  - dn: uid=jane,ou=people,dc=local
-    attributes:
-      objectClass:
-        - inetOrgPerson
-        - simpleSecurityObject
-      userPassword: janepassword
-      uid: jane
-      cn: Jane Doe
-      sn: Doe
-      mail: jane.doe@domain2
-
-  - dn: uid=nomail,ou=people,dc=local
-    attributes:
-      objectClass:
-        - inetOrgPerson
-        - simpleSecurityObject
-      userPassword: nomailpassword
-      uid: nomail
-      cn: No Mail
-      sn: Mail
-      mail: nomail@domain1
-
-  # Groups
-  - dn: "cn=mail,ou=groups,dc=local"
-    state: append
-    attributes:
-      uniqueMember:
-        - uid=john,ou=people,dc=local
-        - uid=jane,ou=people,dc=local
-
-  # Domains
-  - dn: dc=domain1,ou=domains,ou=mail,ou=services,dc=local
-    attributes:
-      objectClass: dNSDomain
-      dc: domain1
-
-  - dn: dc=domain2,ou=domains,ou=mail,ou=services,dc=local
-    attributes:
-      objectClass: dNSDomain
-      dc: domain2
-
-  # Aliases
-  - dn: cn=postmaster@domain1,ou=aliases,ou=mail,ou=services,dc=local
-    attributes:
-      objectClass: nisMailAlias
-      cn: postmaster@domain1
-      rfc822MailMember: john.doe@domain1
-
-  - dn: cn=webmaster@domain2,ou=aliases,ou=mail,ou=services,dc=local
-    attributes:
-      objectClass: nisMailAlias
-      cn: webmaster@domain2
-      rfc822MailMember: jane.doe@domain2
 
 ldap_server_consumers:
   - name: postfix
diff --git a/roles/mail_server/molecule/default/prepare.yml b/roles/mail_server/molecule/default/prepare.yml
index 7c4db18949c1118e604c2f08e41d8f2e169897a1..937c5441beb67bf719c450816e21b84926b7cfb1 100644
--- a/roles/mail_server/molecule/default/prepare.yml
+++ b/roles/mail_server/molecule/default/prepare.yml
@@ -100,3 +100,81 @@
   roles:
     - ldap_server
     - backup_server
+
+- hosts: ldap-server
+  become: true
+  tasks:
+
+    - name: Create LDAP accounts for testing
+      ldap_entry:
+        dn: "{{ item.dn }}"
+        objectClass: "{{ item.objectClass }}"
+        attributes: "{{ item.attributes }}"
+      with_items:
+
+        # Users.
+        - dn: uid=john,ou=people,dc=local
+          objectClass:
+            - inetOrgPerson
+            - simpleSecurityObject
+          attributes:
+            userPassword: johnpassword
+            uid: john
+            cn: John Doe
+            sn: Doe
+            mail: john.doe@domain1
+
+        - dn: uid=jane,ou=people,dc=local
+          objectClass:
+            - inetOrgPerson
+            - simpleSecurityObject
+          attributes:
+            userPassword: janepassword
+            uid: jane
+            cn: Jane Doe
+            sn: Doe
+            mail: jane.doe@domain2
+
+        - dn: uid=nomail,ou=people,dc=local
+          objectClass:
+            - inetOrgPerson
+            - simpleSecurityObject
+          attributes:
+            userPassword: nomailpassword
+            uid: nomail
+            cn: No Mail
+            sn: Mail
+            mail: nomail@domain1
+
+        # Domains
+        - dn: dc=domain1,ou=domains,ou=mail,ou=services,dc=local
+          objectClass: dNSDomain
+          attributes:
+            dc: domain1
+
+        - dn: dc=domain2,ou=domains,ou=mail,ou=services,dc=local
+          objectClass: dNSDomain
+          attributes:
+            dc: domain2
+
+        # Aliases
+        - dn: cn=postmaster@domain1,ou=aliases,ou=mail,ou=services,dc=local
+          objectClass: nisMailAlias
+          attributes:
+            cn: postmaster@domain1
+            rfc822MailMember: john.doe@domain1
+
+        - dn: cn=webmaster@domain2,ou=aliases,ou=mail,ou=services,dc=local
+          objectClass: nisMailAlias
+          attributes:
+            cn: webmaster@domain2
+            rfc822MailMember: jane.doe@domain2
+
+    - name: Add test accounts to correct group
+      ldap_attr:
+        dn: "cn=mail,ou=groups,dc=local"
+        name: uniqueMember
+        state: exact
+        values:
+          - uid=john,ou=people,dc=local
+          - uid=jane,ou=people,dc=local