From 48a9bb48b428e08395179800359d264ef35b5c24 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Wed, 10 Sep 2014 17:07:36 +0100
Subject: Allow the configuration of troves without UPSTREAM_TROVE

Now UPSTREAM_TROVE is not mandatory to configure a Trove, and
if the value is not set, then the configuration of the lorry
controller (lorry-controller.conf) won't include any configuration
for an upstream Trove.
---
 share/lorry-controller.conf | 23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

(limited to 'share')

diff --git a/share/lorry-controller.conf b/share/lorry-controller.conf
index ad6e49a..7a4ab81 100644
--- a/share/lorry-controller.conf
+++ b/share/lorry-controller.conf
@@ -1,25 +1,6 @@
 [
-    {
-        "type": "trove",
-        "uuid": "{{ TROVE_ID }}/initial",
-        "serial": 1,
-        "trovehost": "{{ UPSTREAM_TROVE }}",
-        "protocol": "{{ UPSTREAM_TROVE_PROTOCOL }}",
-        "ls-interval": "4H",
-        "interval": "2H",
-        "create": "always",
-        "destroy": "never",
-        "stagger": true,
-        "prefixmap": {
-            "baserock": "baserock",
-            "delta": "delta"
-        },
-        "ignore": [
-            "baserock/lorries"
-        ],
-        "tarball": "always"
-    },
-    {
+    {% if UPSTREAM_TROVE_STANZA is defined %}{{ UPSTREAM_TROVE_STANZA | to_nice_json |indent(4) }},
+    {% endif %}{
         "type": "lorries",
         "uuid": "{{ TROVE_ID }}/open-source-lorries",
         "serial": 1,
-- 
cgit v1.2.1