diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-17 17:03:36 +0100 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-17 17:03:36 +0100 |
| commit | eca4102de2c146fade89968ba7a68d03b69fc459 (patch) | |
| tree | 73fdb280280d7e89a771c5dff4ef97d80c461ea0 /trove.configure | |
| parent | 562a7fa353747a62cede095ae7790ab4854ec922 (diff) | |
| parent | d980deeb057d80b3c2f83eb2dff2c5b8a7de3a1d (diff) | |
| download | definitions-eca4102de2c146fade89968ba7a68d03b69fc459.tar.gz | |
Merge branch 'baserock/pedroalvarez/optional-upstream-trove'
Reviewed-by: Sam Thursfield
Reviewed-by: Lars Wirzenius
Diffstat (limited to 'trove.configure')
| -rwxr-xr-x | trove.configure | 8 |
1 files changed, 1 insertions, 7 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: |