ldap: Refactor ldap roles

* Move ldap/client to software submodule as ldap
* Rename ldap/server to ldap-server

playbooks/collab.yml

@@ -28,7 +28,7 @@
       keytab: /etc/httpd/httpd.keytab
       principals: HTTP/collab.foo.sh@FOO.SH
       group: apache
-    - ldap/client
+    - ldap
 
   tasks:
     - name: redirect root web directory to collab

playbooks/ldap.yml

@@ -23,7 +23,7 @@
 
   roles:
     - base
-    - ldap/server
+    - ldap-server
     - kerberos/kdc
     - role: ldap_netdb
       when: ldap_master is defined