From 264d5a870ecfcb9574dbe7f45e5a9d7957663625 Mon Sep 17 00:00:00 2001 From: Iain Learmonth Date: Sat, 14 May 2022 14:43:30 +0100 Subject: [PATCH] bridge: explicitly declare ssh private key for hcloud --- app/terraform/bridge/hcloud.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/terraform/bridge/hcloud.py b/app/terraform/bridge/hcloud.py index 9d64e01..bb5b148 100644 --- a/app/terraform/bridge/hcloud.py +++ b/app/terraform/bridge/hcloud.py @@ -7,7 +7,8 @@ class BridgeHcloudAutomation(BridgeAutomation): provider = "hcloud" template_parameters = [ - "hcloud_token" + "hcloud_token", + "ssh_private_key_path" ] template = """ @@ -28,6 +29,10 @@ class BridgeHcloudAutomation(BridgeAutomation): token = "{{ hcloud_token }}" } + locals { + ssh_private_key = file("{{ ssh_private_key_path }}") + } + data "hcloud_datacenters" "ds" { } @@ -59,12 +64,13 @@ class BridgeHcloudAutomation(BridgeAutomation): module "bridge_{{ bridge.id }}" { source = "sr2c/tor-bridge/hcloud" - version = "0.0.2" + version = "0.0.3" datacenter = one(random_shuffle.datacenter_{{ bridge.id }}.result) context = module.label_{{ bridgeconf.group.id }}.context name = "br" attributes = ["{{ bridge.id }}"] ssh_key_name = "bc" + ssh_private_key = local.ssh_private_key contact_info = "hi" distribution_method = "{{ bridge.conf.method }}" }