Whamcloud - gitweb
LU-11237 build: delete obsolete slapd-lustre.conf 89/32989/2
authorAndreas Dilger <adilger@whamcloud.com>
Mon, 13 Aug 2018 17:25:58 +0000 (11:25 -0600)
committerOleg Drokin <green@whamcloud.com>
Mon, 1 Oct 2018 14:00:42 +0000 (14:00 +0000)
Delete the obsolete slapd-lustre.conf file, as it was only used
for LDAP configuration of clients and servers back before
"zero-conf" (MGS+llog) configuration was available.  Also remove
the use of openldap in Makefile.am.

This has been obsolete since Lustre 1.4 or so.

Test-Parameters: trivial
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: If99ca0a62a1753ead1b29d217bc2437bd29e0850
Reviewed-on: https://review.whamcloud.com/32989
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Emoly Liu <emoly@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/conf/Makefile.am
lustre/conf/slapd-lustre.conf [deleted file]

index 3e5bc68..a150daf 100644 (file)
 # Lustre is a trademark of Sun Microsystems, Inc.
 #
 
-EXTRA_DIST = lustre.dtd slapd-lustre.conf lustre2ldif.xsl top.ldif \
+EXTRA_DIST = lustre.dtd lustre2ldif.xsl top.ldif \
              99-lustre.rules lustre ldev.conf ko2iblnd.conf lsvcgss \
              lnet_routes.conf lnet.conf lgssc.conf
-ldapconfdir = $(sysconfdir)/openldap
 
 sysconf_DATA = lnet.conf
 
 if UTILS
-noinst_SCRIPTS = slapd-lustre.conf
 noinst_DATA = top.ldif lustre2ldif.xsl
 sysconf_DATA += lnet_routes.conf
 endif
diff --git a/lustre/conf/slapd-lustre.conf b/lustre/conf/slapd-lustre.conf
deleted file mode 100644 (file)
index b93b411..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#######################################################################
-# lustre ldap config database
-#######################################################################
-
-database       ldbm
-suffix         "fs=lustre"
-rootdn         "cn=Manager,fs=lustre"
-include                /etc/openldap/schema/lustre.schema
-rootpw         secret
-directory      /var/lib/ldap/lustre
-index           objectClass,uuid       eq