jasima/majuna
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bridge: be explicit about ssh private key for ovh

Browse source
This commit is contained in:
Iain Learmonth 2022-05-14 13:53:29 +01:00
parent d29f589eb4
commit 9a8ce373d7
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/terraform/bridge/ovh.py
View file

@ -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 }}"
}