diff options
| author | Michael Drake <michael.drake@codethink.co.uk> | 2014-08-07 10:19:47 +0000 |
|---|---|---|
| committer | Michael Drake <michael.drake@codethink.co.uk> | 2014-08-07 10:19:47 +0000 |
| commit | e752380753b9657c60bae790c10f2a0867e56009 (patch) | |
| tree | d7d7663723495e61da0bf2a2b4c95a3296cc0233 /trove.configure | |
| parent | b782018ff9f04190574b1d482655b1945521daf0 (diff) | |
| parent | 2bae2433c5dc35097bca0165ab50a433ef95d738 (diff) | |
| download | definitions-e752380753b9657c60bae790c10f2a0867e56009.tar.gz | |
Merge branch 'baserock/michaeldrake/mason-devel'
Reviewed-By: Lars Wirzenius <lars.wirzenius@codethink.co.uk>
Diffstat (limited to 'trove.configure')
| -rwxr-xr-x | trove.configure | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/trove.configure b/trove.configure index c7a4f3af..4cc9720a 100755 --- a/trove.configure +++ b/trove.configure @@ -25,6 +25,7 @@ # * TROVE_COMPANY # * LORRY_SSH_KEY # * UPSTREAM_TROVE +# * UPSTREAM_TROVE_PROTOCOL # * TROVE_ADMIN_USER # * TROVE_ADMIN_EMAIL # * TROVE_ADMIN_NAME @@ -136,7 +137,8 @@ trove_configuration={ optional_keys = ('MASON_ID', 'HOSTNAME', 'TROVE_HOSTNAME', - 'LORRY_CONTROLLER_MINIONS', 'TROVE_BACKUP_KEYS') + 'LORRY_CONTROLLER_MINIONS', 'TROVE_BACKUP_KEYS', + 'UPSTREAM_TROVE_PROTOCOL') for key in optional_keys: if key in os.environ: |