You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by ab...@apache.org on 2013/07/26 00:37:50 UTC

git commit: WHIRR-726. Allow customization of Kerberos user

Updated Branches:
  refs/heads/trunk 5006acac0 -> 8683c88d0


WHIRR-726. Allow customization of Kerberos user


Project: http://git-wip-us.apache.org/repos/asf/whirr/repo
Commit: http://git-wip-us.apache.org/repos/asf/whirr/commit/8683c88d
Tree: http://git-wip-us.apache.org/repos/asf/whirr/tree/8683c88d
Diff: http://git-wip-us.apache.org/repos/asf/whirr/diff/8683c88d

Branch: refs/heads/trunk
Commit: 8683c88d0706095091362a95f1efcd2e39356b3c
Parents: 5006aca
Author: Andrew Bayer <an...@gmail.com>
Authored: Fri May 24 14:38:18 2013 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Thu Jul 25 15:37:33 2013 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                     | 3 +++
 .../src/main/resources/functions/configure_kerberos_server.sh   | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/whirr/blob/8683c88d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4485415..2638ee3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,9 @@ Release 0.9.0 (Unreleased Changes)
 
   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)

http://git-wip-us.apache.org/repos/asf/whirr/blob/8683c88d/services/kerberos/src/main/resources/functions/configure_kerberos_server.sh
----------------------------------------------------------------------
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 -re {Re-enter password for principal .* } { send "\$principal_primary\r"
 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