diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-17 14:52:22 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-03-17 14:52:22 +0000 |
| commit | 3e47654e8daee1c4c83a1a4693627b95cb93a366 (patch) | |
| tree | dc1e035df305ea71a6954b267d4495a27090f8dd /trove.configure | |
| parent | 0d50fc299e0072cd56ac7804b54a6c137c501855 (diff) | |
| parent | 3e73cebdb2ef8df99f416696d040e797b856cd24 (diff) | |
| download | definitions-3e47654e8daee1c4c83a1a4693627b95cb93a366.tar.gz | |
Merge branch 'baserock/sam/devel-upgrades-v2'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Diffstat (limited to 'trove.configure')
| -rwxr-xr-x | trove.configure | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/trove.configure b/trove.configure index a1abae97..83d57880 100755 --- a/trove.configure +++ b/trove.configure @@ -30,6 +30,9 @@ # * 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 @@ -41,12 +44,16 @@ 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_ID" -echo "$TROVE_ID" > "$ROOT/etc/hostname" +echo "Set hostname to $TROVE_HOSTNAME" +echo "$TROVE_HOSTNAME" > "$ROOT/etc/hostname" ########################################################################## @@ -58,10 +65,10 @@ lua_escape() echo "Creating /etc/trove-setup.sed" cat <<EOF > "$ROOT"/etc/trove-setup.sed -s/##TROVE_HOSTNAME##/$TROVE_ID/g +s/##TROVE_HOSTNAME##/$TROVE_HOSTNAME/g s/##MASON_HOST##/$MASON_ID/g s/##MASON_PORT##/18755/g -s/##TROVE_TITLE##/$TROVE_ID/g +s/##TROVE_TITLE##/$TROVE_HOSTNAME/g s/##TROVE_COMPANY##/$TROVE_COMPANY/g s/##TROVE_LOG_PREFIX##/$TROVE_ID/g s/##ESC_PERSONAL_PREFIX##/people/g |