No need to set defaults in setup_cluster.sh

These are always set in gpfs-nas.conf.

Signed-off-by: Martin Schwenke <martin@meltin.net>

diff --git a/base/all/root/scripts/setup_cluster.sh b/base/all/root/scripts/setup_cluster.sh
index 37b21dd9b4c51446b8245284f7f5358c45749bfc..74a108cea659e390acc686b1f2f42c53705b3e5d 100755 (executable)
--- a/base/all/root/scripts/setup_cluster.sh
+++ b/base/all/root/scripts/setup_cluster.sh
@@ -50,12 +50,9 @@ 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])
+domain=$(sed -r -n -e 's@^domain[[:space:]]*=[[:space:]]*([^ ]*)[[:space:]]*$@\1@p' "$conf_file" | 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