diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-17 16:54:28 +0100 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-09-17 16:54:28 +0100 |
| commit | e594df7ed432d74cc56eaa5e29a1bfed7b22aae5 (patch) | |
| tree | 3f91726ef415ebd7fed10e301287fe662e1ac7af /share/lorry-controller.conf | |
| parent | b2260b5fb45f4519bf7ea31ac278ffac7cddfbb7 (diff) | |
| parent | 48a9bb48b428e08395179800359d264ef35b5c24 (diff) | |
| download | trove-setup-e594df7ed432d74cc56eaa5e29a1bfed7b22aae5.tar.gz | |
Merge branch 'baserock/pedroalvarez/allow-empty-upstream-trove3'
Reviewed-by: Richard Maw
Reviewed-by: Lars Wirzenius
Diffstat (limited to 'share/lorry-controller.conf')
| -rw-r--r-- | share/lorry-controller.conf | 23 |
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, |