diff options
author | Michael Drake <michael.drake@codethink.co.uk> | 2014-08-05 14:22:32 +0000 |
---|---|---|
committer | Michael Drake <michael.drake@codethink.co.uk> | 2014-08-05 14:22:32 +0000 |
commit | 3665f0e43933ee63b38445f8777ba0de6d91fc6d (patch) | |
tree | 35660e280520ed114c2813eaa83bc1c5d5e40c08 | |
parent | 160fd3f2f1d372751836c0073bdc944df1cfbb91 (diff) | |
download | trove-setup-3665f0e43933ee63b38445f8777ba0de6d91fc6d.tar.gz |
Allow Trove mirroring protocol to be set at deployment timebaserock/michaeldrake/mason-devel
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.
-rw-r--r-- | ansible/roles/trove-setup/tasks/check.yml | 3 | ||||
-rw-r--r-- | share/lorry-controller.conf | 2 |
2 files changed, 4 insertions, 1 deletions
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", |