From 7fff3c91ff0f638bab479b50547753f85ada5120 Mon Sep 17 00:00:00 2001
From: Mauro Torrez <mauro@qom>
Date: Tue, 27 Aug 2019 17:45:08 -0300
Subject: [PATCH] evitar edge case al levantar container

---
 defaults/main.yml |  2 +-
 tasks/main.yml    | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index e99f819..40d584b 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -24,7 +24,7 @@ openldap_replicator_password: password
 openldap_replicator_base: dc=example,dc=com
 
 # port in docker HOST to bind ldap service
-openldap_bind_port: 10389
+openldap_bind_port: 389
 openldap_bind_host: 127.0.0.1
 
 # docker image name
diff --git a/tasks/main.yml b/tasks/main.yml
index 63bd9fa..6416f12 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -56,17 +56,23 @@
       - "{{ openldap_bind_host }}:{{ openldap_bind_port }}:389"
     recreate: "{{ imgbuild is changed }}"
 
-- name: wait for port to become available
-  wait_for:
-    port: "{{ openldap_bind_port }}"
-    
-- include_tasks: "provider.yml"
-  when: "openldap_provider == True"
+- name: Wait for server
+  ldap:
+    state: search
+    dn: cn=config
+    filter: "(objectclass=*)"
+    bind_dn: cn=admin,cn=config
+    bind_pw: "{{ openldap_admin_password }}"
+    server_uri: ldap://localhost:{{ openldap_bind_port }}
+  retries: 20
 
-- include_tasks: "domain.yml"
+- include_tasks: provider.yml
+  when: openldap_provider == True
+
+- include_tasks: domain.yml
   loop: "{{ openldap_domains }}"
   loop_control:
-    loop_var: "domain"
+    loop_var: domain
 
 - set_fact:
     ldap_uri: "{{ lookup( 'vars', 'ldap_uri',