summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-09-10 17:07:36 +0100
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-09-17 16:53:45 +0100
commit48a9bb48b428e08395179800359d264ef35b5c24 (patch)
tree3f91726ef415ebd7fed10e301287fe662e1ac7af /share
parentb2260b5fb45f4519bf7ea31ac278ffac7cddfbb7 (diff)
downloadtrove-setup-48a9bb48b428e08395179800359d264ef35b5c24.tar.gz
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.
Diffstat (limited to 'share')
-rw-r--r--share/lorry-controller.conf23
1 files changed, 2 insertions, 21 deletions
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,