write ldap datadirectory handling more cleanly

host_vars/ldap01.home.foo.sh.yml

@@ -3,4 +3,5 @@ interfaces: [[20, "52:54:00:ac:dc:1f"]]
 vmhost: vmhost01.home.foo.sh
 datadisk_size: [10]
 
+ldap_datadir: /export/ldap
 ldap_master: true

roles/ldap/server/defaults/main.yml

@@ -1,3 +1,4 @@
 ---
 ldap_server_cert: "{% if ldap_master is defined %}ldap01.foo.sh{% else %}\
  ldap.foo.sh{% endif %}"
+ldap_datadir: /srv/ldap

roles/ldap/server/tasks/main.yml

@@ -7,41 +7,26 @@
     - openldap-servers
     - ldapvi
 
-- block:
+- name: fix selinux context from ldap data diretory
-  - name: fix selinux context from ldap data directory
+  sefcontext:
-    sefcontext:
+    path: "{{ ldap_datadir }}(/.*)?"
-      path: /export/ldap(/.*)?
+    setype: slapd_db_t
-      setype: slapd_db_t
+- name: create ldap data directory
-  - name: create ldap data directory
+  file:
-    file:
+    path: "{{ ldap_datadir }}"
-      path: /export/ldap
+    state: directory
-      state: directory
+    mode: 0700
-      mode: 0700
+    owner: ldap
-      owner: ldap
+    group: ldap
-      group: ldap
+- name: link ldap data directory
-  - name: link ldap data directory
+  file:
-    file:
+    path: /srv/ldap
-      path: /srv/ldap
+    src: /export/ldap
-      src: /export/ldap
+    state: link
-      state: link
+    owner: root
-      owner: root
+    group: root
-      group: root
+    follow: false
-      follow: false
+  when: ldap_datadir != "/srv/ldap"
-  when: ldap_master is defined
-
-- block:
-  - name: fix selinux context from ldap data directory
-    sefcontext:
-      path: /srv/ldap(/.*)?
-      setype: slapd_db_t
-  - name: create ldap data directory
-    file:
-      path: /srv/ldap
-      state: directory
-      mode: 0700
-      owner: ldap
-      group: ldap
-  when: ldap_msater is not defined
 
 - name: remove nss cert databases
   file: