From 30e5ba2f175d7d3b80b90176fee686c95ab4402d Mon Sep 17 00:00:00 2001
From: Michael Drake <michael.drake@codethink.co.uk>
Date: Tue, 5 Aug 2014 14:49:53 +0000
Subject: Allow changing upstream trove fetch protocol at configure time

---
 trove.configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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:
-- 
cgit v1.2.1