WHIRR-726. Allow customization of Kerberos user
diff --git a/CHANGES.txt b/CHANGES.txt
index 4485415..2638ee3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,9 @@
IMPROVEMENTS
+ WHIRR-726. Allow specifying a Kerberos user other than
+ $CLUSTER_USER (abayer)
+
WHIRR-722. Improve user and system level logging capability. (graham)
WHIRR-721. Improve robustness of volume device detection. (graham)
diff --git a/services/kerberos/src/main/resources/functions/configure_kerberos_server.sh b/services/kerberos/src/main/resources/functions/configure_kerberos_server.sh
index 0bb1cc1..6b78a95 100644
--- a/services/kerberos/src/main/resources/functions/configure_kerberos_server.sh
+++ b/services/kerberos/src/main/resources/functions/configure_kerberos_server.sh
@@ -18,6 +18,7 @@
set -x
function configure_kerberos_server() {
+ KERBEROS_USER=${KERBEROS_USER:-$CLUSTER_USER}
KERBEROS_REALM_REGEX=$(echo $KERBEROS_REALM | sed s/\\\./\\\\\./g)
service krb5kdc stop
service kadmin stop
@@ -47,8 +48,8 @@
expect EOF
END
chmod +x run_addpinc
- ./run_addpinc $CLUSTER_USER $CLUSTER_USER/admin $KERBEROS_REALM
- ./run_addpinc $CLUSTER_USER $CLUSTER_USER $KERBEROS_REALM
+ ./run_addpinc $KERBEROS_USER $KERBEROS_USER/admin $KERBEROS_REALM
+ ./run_addpinc $KERBEROS_USER $KERBEROS_USER $KERBEROS_REALM
./run_addpinc hdfs hdfs $KERBEROS_REALM
rm -rf ./run_addpinc
service krb5kdc start