summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <michael.drake@codethink.co.uk>2014-08-05 14:49:53 (GMT)
committerMichael Drake <michael.drake@codethink.co.uk>2014-08-05 14:49:53 (GMT)
commit30e5ba2f175d7d3b80b90176fee686c95ab4402d (patch)
tree4ef8f776c43c25cdebe33d0f974cd7cd5646de88
parent8cd4f79f3bc2542817630ad3c0ebc8e31d3b3e4b (diff)
downloaddefinitions-30e5ba2f175d7d3b80b90176fee686c95ab4402d.tar.gz
Allow changing upstream trove fetch protocol at configure time
-rwxr-xr-xtrove.configure4
1 files changed, 3 insertions, 1 deletions
diff --git a/trove.configure b/trove.configure
index c7a4f3a..4cc9720 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: