From 6403bca5a1e483f689c6224a4e6c88b495a666da Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Wed, 17 Sep 2014 17:00:35 +0100
Subject: Update trove-setup ref to use a new version.

This new version allows the configuration of Troves without
an UPSTREAM_TROVE. This is useful to deploy master Troves
like git.baserock.org.
---
 strata/trove.morph | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/strata/trove.morph b/strata/trove.morph
index 14888353..6db0be5d 100644
--- a/strata/trove.morph
+++ b/strata/trove.morph
@@ -198,7 +198,7 @@ chunks:
 - name: trove-setup
   morph: strata/trove/trove-setup.morph
   repo: baserock:baserock/trove-setup
-  ref: b2260b5fb45f4519bf7ea31ac278ffac7cddfbb7
+  ref: e594df7ed432d74cc56eaa5e29a1bfed7b22aae5
   unpetrify-ref: master
   build-depends: []
 - name: lorry-controller
-- 
cgit v1.2.1


From d980deeb057d80b3c2f83eb2dff2c5b8a7de3a1d Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Wed, 10 Sep 2014 17:59:55 +0100
Subject: trove.configure: Make UPSTREAM_TROVE optional

---
 trove.configure      | 8 +-------
 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)
-- 
cgit v1.2.1