From 1f0c0370dad06382e7b89e80c87d1ea0e03bc807 Mon Sep 17 00:00:00 2001
From: Richard Ipsum <richard.ipsum@codethink.co.uk>
Date: Wed, 18 Jun 2014 14:56:33 +0100
Subject: Rename TROVE_HOSTNAME to TROVE_FQDN

---
 trove.configure | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/trove.configure b/trove.configure
index 840f15f5..e641f662 100755
--- a/trove.configure
+++ b/trove.configure
@@ -20,7 +20,7 @@
 # from the environment (see MUSTARD for a description of them):
 #
 #   * TROVE_ID
-#   * TROVE_HOSTNAME (optional, defaults to TROVE_ID)
+#   * TROVE_FQDN
 #   * TROVE_COMPANY
 #   * LORRY_SSH_KEY
 #   * UPSTREAM_TROVE
@@ -41,9 +41,10 @@ set -e
 
 ROOT="$1"
 
-if [ -z "$TROVE_HOSTNAME" ]
+if [ -z "$TROVE_FQDN" ]
 then
-    export TROVE_HOSTNAME="$TROVE_ID"
+    echo "TROVE_FQDN not set" 1>&2
+    exit 1
 fi
 
 ##########################################################################
@@ -60,7 +61,7 @@ lua_escape()
 echo "Creating /etc/trove-setup.sed"
 
 cat <<EOF > "$ROOT"/etc/trove-setup.sed
-s/##TROVE_HOSTNAME##/$TROVE_HOSTNAME/g
+s/##TROVE_FQDN##/$TROVE_FQDN/g
 s/##MASON_HOST##/$MASON_ID/g
 s/##MASON_PORT##/18755/g
 s/##TROVE_TITLE##/$TROVE_ID/g
-- 
cgit v1.2.1