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

bridge: be explicit about ssh private key for gandi

Browse source
This commit is contained in:
Iain Learmonth 2022-05-14 13:54:31 +01:00
parent 9a8ce373d7
commit b7c4f00456
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/terraform/bridge/gandi.py
View file

@ -10,7 +10,8 @@ class BridgeGandiAutomation(BridgeAutomation):
"gandi_openstack_user", "gandi_openstack_user",
"gandi_openstack_password", "gandi_openstack_password",
"gandi_openstack_tenant_name", "gandi_openstack_tenant_name",
"ssh_public_key_path" "ssh_public_key_path",
"ssh_private_key_path"
] ]
template = """ template = """
@ -34,7 +35,8 @@ class BridgeGandiAutomation(BridgeAutomation):
} }
locals { locals {
ssh_key = file("{{ ssh_public_key_path }}") public_ssh_key = file("{{ ssh_public_key_path }}")
private_ssh_key = file("{{ ssh_private_key_path }}")
} }
{% for group in groups %} {% for group in groups %}
@ -56,7 +58,8 @@ class BridgeGandiAutomation(BridgeAutomation):
context = module.label_{{ bridgeconf.group.id }}.context context = module.label_{{ bridgeconf.group.id }}.context
name = "br" name = "br"
attributes = ["{{ bridge.id }}"] attributes = ["{{ bridge.id }}"]
ssh_key = local.ssh_key ssh_key = local.public_ssh_key
ssh_private_key = local.private_ssh_key
contact_info = "hi" contact_info = "hi"
distribution_method = "{{ bridge.conf.method }}" distribution_method = "{{ bridge.conf.method }}"