From 48a9bb48b428e08395179800359d264ef35b5c24 Mon Sep 17 00:00:00 2001 From: Pedro Alvarez 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. --- .../roles/trove-setup/tasks/lorry-controller-setup.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'ansible/roles/trove-setup/tasks/lorry-controller-setup.yml') diff --git a/ansible/roles/trove-setup/tasks/lorry-controller-setup.yml b/ansible/roles/trove-setup/tasks/lorry-controller-setup.yml index fd00ea3..4486884 100644 --- a/ansible/roles/trove-setup/tasks/lorry-controller-setup.yml +++ b/ansible/roles/trove-setup/tasks/lorry-controller-setup.yml @@ -10,6 +10,24 @@ shell: su git -c 'mktemp -d' register: lorry_controller_templates +- set_fact: + UPSTREAM_TROVE_STANZA: { + type: "trove", + trovehost: "{{ UPSTREAM_TROVE }}", + protocol: "{{ UPSTREAM_TROVE_PROTOCOL }}", + ls-interval: "4H", + interval: "2H", + prefixmap: { + baserock: "baserock", + delta: "delta" + }, + ignore: [ + "baserock/lorries" + ], + tarball: "always" + } + when: UPSTREAM_TROVE is defined + - name: Create the configuration files of lorry-controller using templates template: src=/usr/share/trove-setup/{{ item }} dest={{ lorry_controller_templates.stdout }}/{{ item }} owner=git group=git mode=0644 with_items: -- cgit v1.2.1