From 9a8ce373d76ae5f863df60b980d0d1a94937d7ba Mon Sep 17 00:00:00 2001 From: Iain Learmonth Date: Sat, 14 May 2022 13:53:29 +0100 Subject: [PATCH] bridge: be explicit about ssh private key for ovh --- app/terraform/bridge/ovh.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/app/terraform/bridge/ovh.py b/app/terraform/bridge/ovh.py index d1a6a2e..8e7e07c 100644 --- a/app/terraform/bridge/ovh.py +++ b/app/terraform/bridge/ovh.py @@ -13,7 +13,8 @@ class BridgeOvhAutomation(BridgeAutomation): "ovh_openstack_user", "ovh_openstack_password", "ovh_openstack_tenant_id", - "ssh_public_key_path" + "ssh_public_key_path", + "ssh_private_key_path" ] template = """ @@ -50,7 +51,8 @@ class BridgeOvhAutomation(BridgeAutomation): } locals { - ssh_key = file("{{ ssh_public_key_path }}") + public_ssh_key = file("{{ ssh_public_key_path }}") + private_ssh_key = file("{{ ssh_private_key_path }}") } data "ovh_cloud_project_regions" "regions" { @@ -82,12 +84,13 @@ class BridgeOvhAutomation(BridgeAutomation): module "bridge_{{ bridge.id }}" { source = "sr2c/tor-bridge/openstack" - version = "0.0.6" + version = "0.0.7" region = one(random_shuffle.region_{{ bridge.id }}.result) context = module.label_{{ bridgeconf.group.id }}.context name = "br" attributes = ["{{ bridge.id }}"] - ssh_key = local.ssh_key + ssh_key = local.public_ssh_key + ssh_private_key = local.private_ssh_key contact_info = "hi" distribution_method = "{{ bridge.conf.method }}" }