From c543f5db670c20106e93e77526808598c44baa4f Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Mon, 13 Aug 2018 11:25:58 -0600 Subject: [PATCH] LU-11237 build: delete obsolete slapd-lustre.conf 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 Change-Id: If99ca0a62a1753ead1b29d217bc2437bd29e0850 Reviewed-on: https://review.whamcloud.com/32989 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Emoly Liu Reviewed-by: James Nunez Reviewed-by: Oleg Drokin --- lustre/conf/Makefile.am | 4 +--- lustre/conf/slapd-lustre.conf | 11 ----------- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 lustre/conf/slapd-lustre.conf diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am index 3e5bc68..a150daf 100644 --- a/lustre/conf/Makefile.am +++ b/lustre/conf/Makefile.am @@ -32,15 +32,13 @@ # 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 index b93b411..0000000 --- a/lustre/conf/slapd-lustre.conf +++ /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 -- 1.8.3.1