diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-12 10:00:04 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2015-03-12 10:00:04 +0000 |
| commit | db1e0819a425f7839d646fe4e1c37724898b25b9 (patch) | |
| tree | 342fea9c0f46b54487c3888be9df0d7591616d6d | |
| parent | 1b89b00ccfed5adf796c2a5180a8cf6b2e2badf2 (diff) | |
| parent | 234479eadbccce8c3ed039d09ce90774429d05cf (diff) | |
| download | trove-setup-db1e0819a425f7839d646fe4e1c37724898b25b9.tar.gz | |
Merge branch 'sam/useless-settings'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Adam Coldrick <adam.coldrick@codethink.co.uk>
| -rw-r--r-- | ansible/roles/trove-setup/tasks/lorry-controller-setup.yml | 1 | ||||
| -rw-r--r-- | share/lorry-controller.conf | 12 |
2 files changed, 0 insertions, 13 deletions
diff --git a/ansible/roles/trove-setup/tasks/lorry-controller-setup.yml b/ansible/roles/trove-setup/tasks/lorry-controller-setup.yml index f256bc4..f839ca8 100644 --- a/ansible/roles/trove-setup/tasks/lorry-controller-setup.yml +++ b/ansible/roles/trove-setup/tasks/lorry-controller-setup.yml @@ -24,7 +24,6 @@ ignore: [ "baserock/lorries" ], - tarball: "always" } when: UPSTREAM_TROVE is defined diff --git a/share/lorry-controller.conf b/share/lorry-controller.conf index 7a4ab81..930b64e 100644 --- a/share/lorry-controller.conf +++ b/share/lorry-controller.conf @@ -2,28 +2,16 @@ {% 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, "interval": "6H", - "create": "always", - "destroy": "never", - "stagger": true, "prefix": "delta", - "tarball": "always", "globs": [ "open-source-lorries/*.lorry" ] }, { "type": "lorries", - "uuid": "{{ TROVE_ID }}/closed-source-lorries", - "serial": 1, "interval": "6H", - "create": "always", - "destroy": "never", - "stagger": true, "prefix": "delta", - "tarball": "always", "globs": [ "closed-source-lorries/*.lorry" ] |