summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-06-18 13:56:33 (GMT)
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-06-18 13:56:33 (GMT)
commit1f0c0370dad06382e7b89e80c87d1ea0e03bc807 (patch)
treec378873172c4432a307ad479ae2946583456f019
parent8f2511b8204c4f15f0a094479d27f02068fc5341 (diff)
downloaddefinitions-baserock/richardipsum/rename_trove_hostname.tar.gz
Rename TROVE_HOSTNAME to TROVE_FQDNbaserock/richardipsum/rename_trove_hostname
-rwxr-xr-xtrove.configure9
1 files changed, 5 insertions, 4 deletions
diff --git a/trove.configure b/trove.configure
index 840f15f..e641f66 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