[Fai-commit] r6734 - in test-suite/scenarios: configs configs/centos01 fai40-testing/basefiles fai40-testing/class

[Michael Tautschnig]

Author: mt
Date: 2011-10-22 19:49:06 +0000 (Sat, 22 Oct 2011)
New Revision: 6734

Added:
   test-suite/scenarios/configs/centos01/
   test-suite/scenarios/configs/centos01/fai.conf
   test-suite/scenarios/fai40-testing/basefiles/CENTOS6_64.tar
Removed:
   test-suite/scenarios/configs/centos01/fai.conf
Modified:
   test-suite/scenarios/fai40-testing/class/50-host-classes
Log:
test CENTOS support of FAI 4.0


Deleted: test-suite/scenarios/configs/centos01/fai.conf
===================================================================
--- test-suite/scenarios/configs/fai40/fai.conf	2011-10-22 16:42:36 UTC (rev 6732)
+++ test-suite/scenarios/configs/centos01/fai.conf	2011-10-22 19:49:06 UTC (rev 6734)
@@ -1,37 +0,0 @@
-# $Id$
-
-# /etc/fai/fai.conf -- configuration for FAI (Fully Automatic Installation)
-
-# how to access the fai config space
-# If undefined here, make-fai-nfsroot/fai-setup will use default value
-# nfs://<install server>/$FAI_CONFIGDIR
-# supported URL-types: nfs, file, cvs, cvs+ssh, svn+file, svn+http,
-# git, git+http, hg+http
-FAI_CONFIG_SRC=svn://anonscm.debian.org/fai/trunk/examples/simple
-
-# LOGUSER: an account on the install server which saves all log-files
-# and which can change the kernel that is booted via network.
-# Configure .rhosts for this account and PAM, so that root can log in
-# from all install clients without password. This account should have
-# write permissions for /srv/tftp/fai. For example, you can use write
-# permissions for the group linuxadm. chgrp linuxadm /srv/tftp/fai;chmod
-# g+w /srv/tftp/fai. If the variable is undefined, this feature is disabled.
-# Define it, to enable it, eg. LOGUSER=fai
-#LOGUSER=fai
-
-# set protocol type for saving logs. Values: ssh, rsh, ftp
-FAI_LOGPROTO=ssh
-
-# Access to Debian mirror via NFS mounted directory
-# If FAI_DEBMIRROR is defined, install clients mount it to $MNTPOINT
-#FAI_DEBMIRROR=yournfs debianmirror:/path/to/debianmirror
-
-
-# The following variables are read only for almost every user.
-# Do not change them unless you know what you are doing!
-
-# mount point where the mirror will be mounted
-MNTPOINT=/media/mirror
-
-# the local configuration directory on the install client
-FAI=/var/lib/fai/config

Copied: test-suite/scenarios/configs/centos01/fai.conf (from rev 6733, test-suite/scenarios/configs/fai40/fai.conf)
===================================================================
--- test-suite/scenarios/configs/centos01/fai.conf	                        (rev 0)
+++ test-suite/scenarios/configs/centos01/fai.conf	2011-10-22 19:49:06 UTC (rev 6734)
@@ -0,0 +1,37 @@
+# $Id$
+
+# /etc/fai/fai.conf -- configuration for FAI (Fully Automatic Installation)
+
+# how to access the fai config space
+# If undefined here, make-fai-nfsroot/fai-setup will use default value
+# nfs://<install server>/$FAI_CONFIGDIR
+# supported URL-types: nfs, file, cvs, cvs+ssh, svn+file, svn+http,
+# git, git+http, hg+http
+FAI_CONFIG_SRC=svn://anonscm.debian.org/fai/test-suite/scenarios/fai40-testing
+
+# LOGUSER: an account on the install server which saves all log-files
+# and which can change the kernel that is booted via network.
+# Configure .rhosts for this account and PAM, so that root can log in
+# from all install clients without password. This account should have
+# write permissions for /srv/tftp/fai. For example, you can use write
+# permissions for the group linuxadm. chgrp linuxadm /srv/tftp/fai;chmod
+# g+w /srv/tftp/fai. If the variable is undefined, this feature is disabled.
+# Define it, to enable it, eg. LOGUSER=fai
+#LOGUSER=fai
+
+# set protocol type for saving logs. Values: ssh, rsh, ftp
+FAI_LOGPROTO=ssh
+
+# Access to Debian mirror via NFS mounted directory
+# If FAI_DEBMIRROR is defined, install clients mount it to $MNTPOINT
+#FAI_DEBMIRROR=yournfs debianmirror:/path/to/debianmirror
+
+
+# The following variables are read only for almost every user.
+# Do not change them unless you know what you are doing!
+
+# mount point where the mirror will be mounted
+MNTPOINT=/media/mirror
+
+# the local configuration directory on the install client
+FAI=/var/lib/fai/config

Added: test-suite/scenarios/fai40-testing/basefiles/CENTOS6_64.tar
===================================================================
(Binary files differ)


Property changes on: test-suite/scenarios/fai40-testing/basefiles/CENTOS6_64.tar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: test-suite/scenarios/fai40-testing/class/50-host-classes
===================================================================
--- test-suite/scenarios/fai40-testing/class/50-host-classes	2011-10-22 16:44:04 UTC (rev 6733)
+++ test-suite/scenarios/fai40-testing/class/50-host-classes	2011-10-22 19:49:06 UTC (rev 6734)
@@ -18,7 +18,7 @@
 	echo "FAIBASE DEBIAN DHCPC LVM_XEN_SERVER XEN" ;;
     puma)
 	echo "FAIBASE DEBIAN DHCPC RAID_XEN_VIRTUAL" ;;
-    centos)
+    centos*)
 	echo "FAIBASE CENTOS"   # you may want to add class XORG here
 	ifclass I386 && echo CENTOS6_32
 	ifclass AMD64 && echo CENTOS6_64