diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-05 16:13:53 +0100 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-08-05 16:13:53 +0100 |
| commit | ac0d11ed43d65f99a47793e465bef9b2dc2032a3 (patch) | |
| tree | 35660e280520ed114c2813eaa83bc1c5d5e40c08 /share | |
| parent | 160fd3f2f1d372751836c0073bdc944df1cfbb91 (diff) | |
| parent | 3665f0e43933ee63b38445f8777ba0de6d91fc6d (diff) | |
| download | trove-setup-ac0d11ed43d65f99a47793e465bef9b2dc2032a3.tar.gz | |
Merge remote-tracking branch 'origin/baserock/michaeldrake/mason-devel'
Reviewed-by: Lars Wirzenius
Diffstat (limited to 'share')
| -rw-r--r-- | share/lorry-controller.conf | 2 |
1 files changed, 1 insertions, 1 deletions
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", |