From 3665f0e43933ee63b38445f8777ba0de6d91fc6d Mon Sep 17 00:00:00 2001 From: Michael Drake Date: Tue, 5 Aug 2014 14:22:32 +0000 Subject: Allow Trove mirroring protocol to be set at deployment time This allows downstream troves that only need to access publically available content to be able to operate without configuring ssh keys on the upstream trove. --- ansible/roles/trove-setup/tasks/check.yml | 3 +++ share/lorry-controller.conf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible/roles/trove-setup/tasks/check.yml b/ansible/roles/trove-setup/tasks/check.yml index d873030..6305a78 100644 --- a/ansible/roles/trove-setup/tasks/check.yml +++ b/ansible/roles/trove-setup/tasks/check.yml @@ -29,6 +29,9 @@ - fail: msg='UPSTREAM_TROVE is mandatory' when: UPSTREAM_TROVE is not defined +- set_fact: UPSTREAM_TROVE_PROTOCOL=ssh + when: UPSTREAM_TROVE_PROTOCOL is not defined + - set_fact: TROVE_HOSTNAME={{ TROVE_ID }} when: TROVE_HOSTNAME is not defined diff --git a/share/lorry-controller.conf b/share/lorry-controller.conf index 0c90cc4..ad6e49a 100644 --- a/share/lorry-controller.conf +++ b/share/lorry-controller.conf @@ -4,7 +4,7 @@ "uuid": "{{ TROVE_ID }}/initial", "serial": 1, "trovehost": "{{ UPSTREAM_TROVE }}", - "protocol": "ssh", + "protocol": "{{ UPSTREAM_TROVE_PROTOCOL }}", "ls-interval": "4H", "interval": "2H", "create": "always", -- cgit v1.2.1