summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-03-17 15:49:16 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-03-17 15:49:16 (GMT)
commit0ed129b7644d080ddab8447b183e666623563e6b (patch)
treea2cf7d4e6c1b7d7b74683d548d3c61482cffaf51
parent3e47654e8daee1c4c83a1a4693627b95cb93a366 (diff)
downloaddefinitions-0ed129b7644d080ddab8447b183e666623563e6b.tar.gz
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.
-rwxr-xr-xtrove.configure15
1 files changed, 4 insertions, 11 deletions
diff --git a/trove.configure b/trove.configure
index 83d5788..a1abae9 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