diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-10 17:59:55 +0100 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-17 17:02:48 +0100 |
| commit | d980deeb057d80b3c2f83eb2dff2c5b8a7de3a1d (patch) | |
| tree | 73fdb280280d7e89a771c5dff4ef97d80c461ea0 | |
| parent | 6403bca5a1e483f689c6224a4e6c88b495a666da (diff) | |
| download | definitions-d980deeb057d80b3c2f83eb2dff2c5b8a7de3a1d.tar.gz | |
trove.configure: Make UPSTREAM_TROVE optional
| -rwxr-xr-x | trove.configure | 8 | ||||
| -rw-r--r-- | trove.configure.help | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/trove.configure b/trove.configure index 4cc9720a..f823762c 100755 --- a/trove.configure +++ b/trove.configure @@ -64,11 +64,6 @@ if test "x$TROVE_COMPANY" = "x"; then error_vars=true fi -if test "x$UPSTREAM_TROVE" = "x"; then - echo "ERROR: UPSTREAM_TROVE needs to be defined." - error_vars=true -fi - if test "x$TROVE_ADMIN_USER" = "x"; then echo "ERROR: TROVE_ADMIN_USER needs to be defined." error_vars=true @@ -124,7 +119,6 @@ import os, sys, yaml trove_configuration={ 'TROVE_ID': os.environ['TROVE_ID'], 'TROVE_COMPANY': os.environ['TROVE_COMPANY'], - 'UPSTREAM_TROVE': os.environ['UPSTREAM_TROVE'], 'TROVE_ADMIN_USER': os.environ['TROVE_ADMIN_USER'], 'TROVE_ADMIN_EMAIL': os.environ['TROVE_ADMIN_EMAIL'], 'TROVE_ADMIN_NAME': os.environ['TROVE_ADMIN_NAME'], @@ -138,7 +132,7 @@ trove_configuration={ optional_keys = ('MASON_ID', 'HOSTNAME', 'TROVE_HOSTNAME', 'LORRY_CONTROLLER_MINIONS', 'TROVE_BACKUP_KEYS', - 'UPSTREAM_TROVE_PROTOCOL') + 'UPSTREAM_TROVE', 'UPSTREAM_TROVE_PROTOCOL') for key in optional_keys: if key in os.environ: diff --git a/trove.configure.help b/trove.configure.help index b8056e37..c96bdf74 100644 --- a/trove.configure.help +++ b/trove.configure.help @@ -82,8 +82,8 @@ help: | access it. This configuration does not do that automatically. * `UPSTREAM_TROVE` -- public name of the upstream Trove (domain - name or IP address). The new Trove will be configured to mirror - that Trove. + name or IP address). This is an optional setting. If it's set, + the new Trove will be configured to mirror that Trove. * `TROVE_ADMIN_USER`, `TROVE_ADMIN_EMAIL`, `TROVE_ADMIN_NAME`, `TROVE_ADMIN_SSH_PUBKEY` -- details of the Trove's (initial) |