LU-16751 conf: remove outdated config files

Remove the example modules.conf. This config file isn't really
specific to Lustre, and it very outdated regardless.

The remaining conf files (lustre.dtd, lustre2ldif.xsl, top.ldif)
were added ~15 years ago. They don't appear to account for the
changes in Lustre in the interim. It would be better to remove
them.

Also, update .gitignore.

Test-Parameters: trivial
Signed-off-by: Timothy Day <timday@amazon.com>
Change-Id: Ia96eaac0a57c4b65c98d4b7931c96b344d7abd56
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51150
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/lustre/conf/Makefile.am b/lustre/conf/Makefile.am
index c54473b..3b80868 100644 (file)
--- a/lustre/conf/Makefile.am
+++ b/lustre/conf/Makefile.am
@@ -34,14 +34,13 @@
 SUBDIRS = resource
 DIST_SUBDIRS = resource
 
-EXTRA_DIST = lustre.dtd lustre.xml lustre2ldif.xsl top.ldif \
-             99-lustre.rules lustre ldev.conf ko2iblnd.conf lsvcgss \
-             lnet_routes.conf lnet.conf lgssc.conf 99-lustre-server.rules
+EXTRA_DIST = lustre.xml 99-lustre.rules lustre ldev.conf ko2iblnd.conf \
+             lsvcgss lnet_routes.conf lnet.conf lgssc.conf \
+             99-lustre-server.rules
 
 sysconf_DATA = lnet.conf
 
 if UTILS
-noinst_DATA = top.ldif lustre2ldif.xsl
 sysconf_DATA += lnet_routes.conf
 endif
 

diff --git a/lustre/conf/lustre.dtd b/lustre/conf/lustre.dtd
deleted file mode 100644 (file)
index 360f4a0..0000000
--- a/lustre/conf/lustre.dtd
+++ /dev/null
@@ -1,145 +0,0 @@
-<!-- Lustre Management DTD -->
-
-<!-- basic entities -->
-<!ENTITY % object.content "(#PCDATA)">
-<!ENTITY % object.attr "
-             name CDATA #REQUIRED
-             uuid CDATA #REQUIRED">
-
-<!ENTITY % objref.content "(#PCDATA)">
-<!ENTITY % objref.attr    "uuidref CDATA #REQUIRED">
-
-<!-- main elements -->
-<!ELEMENT lustre (node | profile | mountpoint | ldlm | ptlrpc |echoclient |
-                  mds | mdsdev| ost | osd | lov | lovconfig)*>
-<!ATTLIST lustre version CDATA #REQUIRED>
-
-<!ELEMENT node (network | routetbl | profile_ref | timeout | 
-                lustreUpcall | portalsUpcall | ptldebug | subsystem)*>
-<!ATTLIST node %object.attr;
-               router CDATA #IMPLIED>
-               
-<!ELEMENT network (nid | port | route_tbl | sendmem | recvmem)*>
-<!ATTLIST network %object.attr;
-                  nettype (tcp | elan | gm) 'tcp'>
-
-<!ELEMENT routetbl (route)*>
-<!ATTLIST routetbl %object.attr;>
-<!ELEMENT route %object.content;>
-<!ATTLIST route type (elan | tcp | gm) #REQUIRED
-                gw CDATA #REQUIRED
-                lo CDATA #REQUIRED
-                hi CDATA #IMPLIED >
-
-<!ELEMENT profile (ldlm_ref | ptlrpc_ref | network_ref | routetbl_ref |
-                   osd_ref | mdsdev_ref | lovconfig_ref|
-                   echoclient_ref | mountpoint_ref)*>
-<!ATTLIST profile %object.attr;>
-
-<!ELEMENT mountpoint path #REQUIRED
-                     clientoptions #REQUIRED >
-                     filesystem_ref #REQUIRED >
-<!ATTLIST mountpoint %object.attr;>
-
-<!ELEMENT echoclient (obd_ref)>
-<!ATTLIST echoclient %object.attr;>
-
-<!ELEMENT ldlm EMPTY>
-<!ATTLIST ldlm %object.attr;>
-
-<!ELEMENT ptlrpc EMPTY>
-<!ATTLIST ptlrpc %object.attr;>
-
-<!ELEMENT osd (fstype | devpath | devsize | autoformat | 
-               target_ref | node_ref | journalsize | mkfsoptions | mountfsoptions)*>
-<!ATTLIST osd %object.attr; 
-              osdtype (obdfilter | obdecho) 'obdfilter'>
-
-<!ELEMENT ost (active_ref | group)*>
-<!ATTLIST ost %object.attr;
-              failover ( 1 | 0 ) #IMPLIED>
-
-<!ELEMENT filesystem mds_ref #REQUIRED
-                     obd_ref #REQUIRED>
-<!ATTLIST filesystem %object.attr;>
-
-<!ELEMENT mds (active_ref | lovconfig_ref | group)*>
-<!ATTLIST mds %object.attr;
-              failover ( 1 | 0 ) #IMPLIED>
-
-<!ELEMENT mdsdev (fstype | devpath | devsize | autoformat | 
-                  target_ref | node_ref | journalsize | mkfsoptions | mountfsoptions)*>
-<!ATTLIST mdsdev %object.attr;>
-
-<!ELEMENT lov (mds_ref |(obd_ref)+)*>
-<!ATTLIST lov %object.attr;
-               stripesize    CDATA #REQUIRED
-               stripecount   CDATA #REQUIRED
-               stripeoffset  CDATA #IMPLIED
-               stripepattern CDATA #REQUIRED>
-
-<!ELEMENT lovconfig (lov_ref)>
-<!ATTLIST lovconfig %object.attr;>
-
-<!-- basic elements -->
-<!ELEMENT recoveryUpcall %object.content;>
-<!ELEMENT timeout       %object.content;>
-<!ELEMENT ptldebug      %object.content;>
-<!ELEMENT subsystem     %object.content;>
-<!ELEMENT journalsize   %object.content;>
-<!ELEMENT mkfsoptions   %object.content;>
-<!ELEMENT mountfsoptions %object.content;>
-<!ELEMENT clientoptions %object.content;>
-<!ELEMENT fstype        %object.content;>
-<!ELEMENT nid           %object.content;>
-<!ELEMENT port          %object.content;>
-<!ELEMENT sendmem       %object.content;>
-<!ELEMENT recvmem       %object.content;>
-<!ELEMENT autoformat    %object.content;>
-<!ELEMENT activetarget  %object.content;>
-<!ELEMENT devpath       %object.content;>
-<!ELEMENT devsize       %object.content;>
-<!ELEMENT path          %object.content;>
-<!ELEMENT fileset       %object.content;>
-
-<!-- object reference tag elements -->
-<!ELEMENT network_ref     %objref.content;>
-<!ATTLIST network_ref     %objref.attr;>
-<!ELEMENT routetbl_ref    %objref.content;>
-<!ATTLIST routetbl_ref    %objref.attr;>
-<!ELEMENT node_ref        %objref.content;>
-<!ATTLIST node_ref        %objref.attr;>
-<!ELEMENT profile_ref     %objref.content;>
-<!ATTLIST profile_ref     %objref.attr;>
-<!ELEMENT osd_ref         %objref.content;>
-<!ATTLIST osd_ref         %objref.attr;>
-<!ELEMENT mds_ref         %objref.content;>
-<!ATTLIST mds_ref         %objref.attr;>
-<!ELEMENT mdsdev_ref      %objref.content;>
-<!ATTLIST mdsdev_ref      %objref.attr;>
-<!ELEMENT obd_ref         %objref.content;>
-<!ATTLIST obd_ref         %objref.attr;>
-<!ELEMENT ost_ref         %objref.content;>
-<!ATTLIST ost_ref         %objref.attr;>
-<!ELEMENT active_ref      %objref.content;>
-<!ATTLIST active_ref      %objref.attr;>
-<!ELEMENT target_ref      %objref.content;>
-<!ATTLIST target_ref      %objref.attr;>
-<!ELEMENT lov_ref         %objref.content;>
-<!ATTLIST lov_ref         %objref.attr;>
-<!ELEMENT lovconfig_ref   %objref.content;>
-<!ATTLIST lovconfig_ref   %objref.attr;>
-<!ELEMENT mountpoint_ref  %objref.content;>
-<!ATTLIST mountpoint_ref  %objref.attr;>
-<!ELEMENT filesystem_ref  %objref.content;>
-<!ATTLIST filesystem_ref  %objref.attr;>
-<!ELEMENT echoclient_ref  %objref.content;>
-<!ATTLIST echoclient_ref  %objref.attr;>
-<!ELEMENT failover_ref    %objref.content;>
-<!ATTLIST failover_ref    %objref.attr;>
-<!ELEMENT ldlm_ref        %objref.content;>
-<!ATTLIST ldlm_ref        %objref.attr;>
-<!ELEMENT ptlrpc_ref      %objref.content;>
-<!ATTLIST ptlrpc_ref      %objref.attr;>
-
-

diff --git a/lustre/conf/lustre2ldif.xsl b/lustre/conf/lustre2ldif.xsl
deleted file mode 100644 (file)
index 58b0649..0000000
--- a/lustre/conf/lustre2ldif.xsl
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<stylesheet version="1.0" xmlns="http://www.w3.org/1999/XSL/Transform"> 
-<output omit-xml-declaration="yes" />
-<strip-space elements="*"/>
-<param name="config">fs=lustre</param>
-<variable name="basedn">config=<value-of select="$config"/>,fs=lustre</variable>
-
-<template match="lustre">
-dn: <value-of select="$basedn"/>
-uuid: CONFIG_UUID
-objectClass: LUSTRECONFIG
-config: <value-of select="$config"/>
-version: <value-of select="@version"/>
-<text>
-</text><apply-templates/>
-</template>
-
-<template match="node">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: NODE
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/>
-networkRef: <value-of select="network/@uuid"/>
-<for-each select="profile_ref">
-profileRef: <value-of select="@uuidref"/>
-</for-each>
-<if test="timeout">
-timeout: <value-of select="timeout"/>
-</if>
-<if test="lustreUpcall">
-lustreUpcall: <value-of select="lustreUpcall"/>
-</if>
-<if test="portalsUpcall">
-portalsUpcall: <value-of select="portalsUpcall"/>
-</if>
-<if test="ptldebug">
-ptldebug: <value-of select="ptldebug"/>
-</if>
-<if test="subsystem">
-subsystem: <value-of select="subsystem"/>
-</if>
-<text>
-</text>
-<for-each select="network">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: NETWORK
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/>
-nettype: <value-of select="@nettype"/>
-nid: <value-of select="nid"/>
-<if test="port">
-port: <value-of select="port"/>
-</if>
-<text>
-</text>
-</for-each>
-</template>
-
-<template match="profile">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: PROFILE
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/><apply-templates/>
-<text>
-</text>
-</template>
-
-<template match="network">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: NETWORK
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/>
-nettype: <value-of select="@nettype"/>
-nid: <value-of select="nid"/>
-<if test="port">
-port: <value-of select="port"/>
-</if>
-<text>
-</text>
-</template>
-
-
-<template match="mds">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: MDS
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/>
-activeRef: <value-of select="active_ref/@uuidref"/>
-<if test="lovconfig_ref">
-lovconfigRef: <value-of select="lovconfig_ref/@uuidref"/>
-</if>
-<if test="filesystem_ref">
-filesystemRef: <value-of select="filesystem_ref/@uuidref"/>
-</if>
-<if test="@failover">
-failover: <value-of select="@failover"/>
-</if>
-<if test="group">
-group: <value-of select="group"/>
-</if>
-<text>
-</text>
-</template>
-
-<template match="mdsdev">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: MDSDEV
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/>
-<if test="fstype">
-fstype: <value-of select="fstype"/>
-</if>
-<if test="autoformat">
-autoformat: <value-of select="autoformat"/>
-</if>
-<if test="devpath">
-devpath: <value-of select="devpath"/>
-</if>
-<if test="devsize">
-devsize: <value-of select="devsize"/>
-</if>
-<if test="journalsize">
-journalsize: <value-of select="journalsize"/>
-</if>
-<if test="mkfsoptions">
-mkfsoptions: <value-of select="mkfsoptions"/>
-</if>
-<if test="mountfsoptions">
-mountfsoptions: <value-of select="mountfsoptions"/>
-</if>
-nodeRef: <value-of select="node_ref/@uuidref"/>
-targetRef: <value-of select="target_ref/@uuidref"/>
-<text>
-</text>
-</template>
-
-<template match="lov">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: LOV
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/>
-mdsRef: <value-of select="mds_ref/@uuidref"/>
-stripepattern: <value-of select="@stripepattern"/>
-stripesize: <value-of select="@stripesize"/>
-stripecount: <value-of select="@stripecount"/><apply-templates/>
-<text>
-</text>
-</template>
-
-<template match="lovconfig">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: LOVCONFIG
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/><apply-templates/>
-<text>
-</text>
-</template>
-
-<template match="osd">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: OSD
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/>
-nodeRef: <value-of select="node_ref/@uuidref"/>
-targetRef: <value-of select="target_ref/@uuidref"/>
-osdtype: <value-of select="@osdtype"/>
-<if test="fstype">
-fstype: <value-of select="fstype"/>
-</if>
-<if test="autoformat">
-autoformat: <value-of select="autoformat"/>
-</if>
-<if test="devpath">
-devpath: <value-of select="devpath"/>
-</if>
-<if test="devsize">
-devsize: <value-of select="devsize"/>
-</if>
-<if test="journalsize">
-journalsize: <value-of select="journalsize"/>
-</if>
-<if test="mkfsoptions">
-mkfsoptions: <value-of select="mkfsoptions"/>
-</if>
-<if test="mountfsoptions">
-mountfsoptions: <value-of select="mountfsoptions"/>
-</if>
-<text>
-</text>
-</template>
-
-<template match="ost">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: OST
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/>
-activeRef: <value-of select="active_ref/@uuidref"/>
-<if test="@failover">
-failover: <value-of select="@failover"/>
-</if>
-<if test="group">
-group: <value-of select="group"/>
-</if>
-<text>
-</text>
-</template>
-
-<template match="filesystem">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: FILESYSTEM
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/><apply-templates/>
-<text>
-</text>
-</template>
-
-<template match="mountpoint">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: MOUNTPOINT
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/><apply-templates/>
-<if test="clientoptions">
-clientoptions: <value-of select="clientoptions"/>
-</if>
-<text>
-</text>
-</template>
-
-<template match="echoclient">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: ECHOCLIENT
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/><apply-templates/>
-<text>
-</text>
-</template>
-
-<template match="ldlm">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: LDLM
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/>
-<text>
-</text>
-</template>
-
-<template match="ptlrpc">
-dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: PTLRPC
-lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/>
-<text>
-</text>
-</template>
-
-<template match="ldlm_ref">
-ldlmRef: <value-of select="@uuidref"/>
-</template>
-
-<template match="ptlrpc_ref">
-ptlrpcRef: <value-of select="@uuidref"/>
-</template>
-
-<template match="obd_ref">
-obdRef: <value-of select="@uuidref"/>
-</template>
-
-<template match="osd_ref">
-osdRef: <value-of select="@uuidref"/>
-</template>
-
-<template match="ost_ref">
-ostRef: <value-of select="@uuidref"/>
-</template>
-
-<template match="network_ref">
-networkRef: <value-of select="@uuidref"/>
-</template>
-
-<template match="mds_ref">
-mdsRef: <value-of select="@uuidref"/>
-</template>
-
-<template match="mdsdev_ref">
-mdsdevRef: <value-of select="@uuidref"/>
-</template>
-
-<template match="mountpoint_ref">
-mountpointRef: <value-of select="@uuidref"/>
-</template>
-
-<template match="filesystem_ref">
-filesystemRef: <value-of select="@uuidref"/>
-</template>
-
-<template match="echoclient_ref">
-echoclientRef: <value-of select="@uuidref"/>
-</template>
-
-<template match="lov_ref">
-lovRef: <value-of select="@uuidref"/>
-</template>
-
-<template match="path">
-path: <value-of select="."/>
-</template>
-
-</stylesheet>

diff --git a/lustre/conf/modules.conf b/lustre/conf/modules.conf
deleted file mode 100644 (file)
index a5bdefa..0000000
--- a/lustre/conf/modules.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# sample modules.conf for autoloading lustre modules on zeroconf clients
-
-add below kptlrouter portals
-#add below ksocknal kptlrouter
-#add below kqswnal kptlrouter
-add below ptlrpc ksocknal
-add below llite lov osc 
-alias lustre llite

diff --git a/lustre/conf/top.ldif b/lustre/conf/top.ldif
deleted file mode 100644 (file)
index d0cfdac..0000000
--- a/lustre/conf/top.ldif
+++ /dev/null
@@ -1,4 +0,0 @@
-dn: fs=lustre
-fs:lustre
-objectClass: lustre
-lustreDesc: Lustre Config

diff --git a/lustre/tests/.gitignore b/lustre/tests/.gitignore
index 014fefb..cc7d016 100644 (file)
--- a/lustre/tests/.gitignore
+++ b/lustre/tests/.gitignore
@@ -23,6 +23,7 @@
 /createtest
 /directio
 /expand_truncate_test
+/fadvise_dontneed_helper
 /fchdir_test
 /flock_deadlock
 /flock_test