Update /etc/krb5.conf using configured domain

diff --git a/base/all/root/scripts/gpfs-nas.conf b/base/all/root/scripts/gpfs-nas.conf
index 0e5d0e3206e52a64afd167e7f4be13be6a6e423c..773d877160db88323f91ee63c4706fa37a3da7c4 100644 (file)
--- a/base/all/root/scripts/gpfs-nas.conf
+++ b/base/all/root/scripts/gpfs-nas.conf
@@ -2,6 +2,7 @@
 cluster = @@CLUSTER@@
 domain = @@DOMAIN@@
 workgroup = @@WORKGROUP@@
+kdc = @@KDC_NAME@@
 chroot_parent = /var/lib/gpfs-nas-chroot
 scp_chroot = %(chroot_parent)s/scp
 gpfs_default_mountpoint = @@GPFS_DEFAULT_MOUNTPOINT@@

diff --git a/base/all/root/scripts/setup_cluster.sh b/base/all/root/scripts/setup_cluster.sh
index d7a5a01468a47d5901248bf04dd1767de6478270..7e4decc56bf5007bb2b76095a26d6b7f2e3259f3 100755 (executable)
--- a/base/all/root/scripts/setup_cluster.sh
+++ b/base/all/root/scripts/setup_cluster.sh
@@ -50,6 +50,13 @@ case "$auth_type" in
        usage
 esac
 
+domain=$(sed -r -n -e 's@^domain[[:space:]]*=[[:space:]]*([^ ]*)[[:space:]]*$@\1@p' "$conf_file")
+domain=${domain:-"vsofs1.com"}
+domain=$(echo $domain | tr [a-z] [A-Z])
+
+kdc=$(sed -r -n -e 's@^kdc[[:space:]]*=[[:space:]]*([^ ]*)[[:space:]]*$@\1@p' "$conf_file")
+kdc=${kdc:-"foo"}
+
 echo "Enabling NTP and ensuring it is started..."
 onnode -p all chkconfig ntpd on
 onnode -p all service ntpd restart
@@ -68,13 +75,13 @@ case "$auth_type" in
        echo "Setting up NSS, PAM, KRB5..."
        onnode -p all authconfig --update --nostart \
            --enablewinbindauth --enablewinbind \
-           --disablekrb5 --krb5kdc=foo.vsofs1.com  --krb5realm=vsofs1.com
+           --disablekrb5 --krb5kdc=$kdc.$domain  --krb5realm=$domain
        ;;
     files)
        echo "Setting up NSS, PAM, KRB5..."
        onnode -p all authconfig --update --nostart \
            --disablewinbindauth --disablewinbind \
-           --disablekrb5 --krb5kdc=foo.vsofs1.com  --krb5realm=vsofs1.com
+           --disablekrb5 --krb5kdc=$kdc.$domain  --krb5realm=$domain
        ;;
 esac