Revert "trove: Allow TROVE_HOSTNAME different to TROVE_ID"

This reverts commit 3e73cebdb2ef8df99f416696d040e797b856cd24.

This patch was accidentally pushed without review as part of the
previous branch.

1 files changed, 4 insertions, 11 deletions

diff --git a/trove.configure b/trove.configure
index 83d57880..a1abae97 100755
--- a/trove.configure
+++ b/trove.configure
@@ -30,9 +30,6 @@
 #   * TROVE_ADMIN_NAME
 #   * TROVE_ADMIN_SSH_PUBKEY
 #
-# Optionally, you can specify 'TROVE_HOSTNAME' as well. If not set, this
-# defaults to the same as 'TROVE_ID'.
-#
 # The configuration of a Trove is slightly tricky: part of it has to
 # be run on the configured system after it has booted. We accomplish
 # this by copying in all the relevant data to the target system
@@ -44,16 +41,12 @@ set -e
 
 ROOT="$1"
 
-if [ -z "$TROVE_HOSTNAME" ]; then
-    TROVE_HOSTNAME="$TROVE_ID"
-fi
-
 ##########################################################################
 # Configuration in /etc, which we need to do on all deployments.
 ##########################################################################
 
-echo "Set hostname to $TROVE_HOSTNAME"
-echo "$TROVE_HOSTNAME" > "$ROOT/etc/hostname"
+echo "Set hostname to $TROVE_ID"
+echo "$TROVE_ID" > "$ROOT/etc/hostname"
 
 ##########################################################################
 
@@ -65,10 +58,10 @@ lua_escape()
 echo "Creating /etc/trove-setup.sed"
 
 cat <<EOF > "$ROOT"/etc/trove-setup.sed
-s/##TROVE_HOSTNAME##/$TROVE_HOSTNAME/g
+s/##TROVE_HOSTNAME##/$TROVE_ID/g
 s/##MASON_HOST##/$MASON_ID/g
 s/##MASON_PORT##/18755/g
-s/##TROVE_TITLE##/$TROVE_HOSTNAME/g
+s/##TROVE_TITLE##/$TROVE_ID/g
 s/##TROVE_COMPANY##/$TROVE_COMPANY/g
 s/##TROVE_LOG_PREFIX##/$TROVE_ID/g
 s/##ESC_PERSONAL_PREFIX##/people/g