From 7336268759f8d210d2270d0182bceda2c81766be Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Fri, 23 May 2014 12:27:38 +0000 Subject: Allow TROVE_HOSTNAME to be set separately from TROVE_ID --- trove.configure | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'trove.configure') diff --git a/trove.configure b/trove.configure index 4bbe50d5..a4000e42 100755 --- a/trove.configure +++ b/trove.configure @@ -20,6 +20,7 @@ # from the environment (see MUSTARD for a description of them): # # * TROVE_ID +# * TROVE_HOSTNAME (optional, defaults to TROVE_ID) # * TROVE_COMPANY # * LORRY_SSH_KEY # * UPSTREAM_TROVE @@ -42,6 +43,11 @@ set -e ROOT="$1" +if [ -z "$TROVE_HOSTNAME" ] +then + export TROVE_HOSTNAME="$TROVE_ID" +fi + ########################################################################## # Configuration in /etc, which we need to do on all deployments. ########################################################################## @@ -56,7 +62,7 @@ lua_escape() echo "Creating /etc/trove-setup.sed" cat < "$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 -- cgit v1.2.1