From 32c1902eb8094ab5ebc75b1e32cef6fe50ee483b Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Mon, 16 Jun 2014 16:05:01 +1000
Subject: Remove INSTALLKEY configuration variable

RHEL 7.0 kickstart fails on "key" directive so remove this "feature".
We haven't actually used it for a long time.  If needed then do it
post-kickstart.

Signed-off-by: Martin Schwenke <martin@meltin.net>
---
 autocluster                 | 15 ---------------
 config.d/00base.defconf     |  3 ---
 templates/nas-kickstart.cfg |  1 -
 3 files changed, 19 deletions(-)

diff --git a/autocluster b/autocluster
index 59678df..54e7462 100755
--- a/autocluster
+++ b/autocluster
@@ -569,21 +569,6 @@ create_base()
     echo "Creating kickstart file from template"
     substitute_vars "$KICKSTART" "tmp/ks.cfg"
 
-    if [ $INSTALLKEY = "--skip" ]; then
-	cat <<EOF
---------------------------------------------------------------------------------------
-WARNING: You have not entered an install key. Some RHEL packages will not be installed.
-
-Please enter a valid RHEL install key in your config file like this:
-
-  INSTALLKEY="1234-5678-0123-4567"
-
-The install will continue without an install key in 5 seconds
---------------------------------------------------------------------------------------
-EOF
-	sleep 5
-    fi
-
     # $ISO gets $ISO_DIR prepended if it doesn't start with a leading '/'.
     case "$ISO" in
 	(/*) : ;;
diff --git a/config.d/00base.defconf b/config.d/00base.defconf
index b41632d..e627f25 100644
--- a/config.d/00base.defconf
+++ b/config.d/00base.defconf
@@ -527,9 +527,6 @@ defconf EXTRA_PACKAGES '' \
 defconf EXTRA_CHKCONFIGS "" \
 	"<chkconfigs>" "extra chkconfig commands to run in post-install"
 
-defconf INSTALLKEY "--skip" \
-	"<key>" "RHEL install key"
-
 defconf STANDARD_POSTINSTALL "$installdir/templates/basic-postinstall.sh" \
 	"<file>" "standard kickstart postinstall script - change with care"
 
diff --git a/templates/nas-kickstart.cfg b/templates/nas-kickstart.cfg
index 23341d4..55b4b6a 100644
--- a/templates/nas-kickstart.cfg
+++ b/templates/nas-kickstart.cfg
@@ -3,7 +3,6 @@
 install
 cdrom
 #ignoredisk --drives=[sdb,sdc,sdd,sde,sdf,sdg,sdh,sdi,sdj,sdk,sdl,sdm,sdn,sdo,sdp,sdq,sdr,sds,sdt,sdu,sdv,sdw,sdx,sdy,sdz,sdaa]
-key @@INSTALLKEY@@
 lang @@KS_LANGUAGE@@
 keyboard @@KEYBOARD@@
 skipx
-- 
cgit