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

bridge: use bundled modules

Browse source
This commit is contained in:
Iain Learmonth 2022-08-30 10:24:58 +01:00
parent 32239c379a
commit 3163286e88
5 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/terraform/bridge/aws.py
View file

@ -46,8 +46,7 @@ class BridgeAWSAutomation(BridgeAutomation):
{% for bridge in bridgeconf.bridges %} {% for bridge in bridgeconf.bridges %}
{% if not bridge.destroyed %} {% if not bridge.destroyed %}
module "bridge_{{ bridge.id }}" { module "bridge_{{ bridge.id }}" {
source = "sr2c/tor-bridge/aws" source = "{{ terraform_modules_path }}/terraform-aws-tor-bridge"
version = "0.0.1"
ssh_key = local.ssh_key ssh_key = local.ssh_key
contact_info = "hi" contact_info = "hi"
context = module.label_{{ bridgeconf.group.id }}.context context = module.label_{{ bridgeconf.group.id }}.context

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

@ -54,8 +54,7 @@ class BridgeGandiAutomation(BridgeAutomation):
{% for bridge in bridgeconf.bridges %} {% for bridge in bridgeconf.bridges %}
{% if not bridge.destroyed %} {% if not bridge.destroyed %}
module "bridge_{{ bridge.id }}" { module "bridge_{{ bridge.id }}" {
source = "sr2c/tor-bridge/openstack" source = "{{ terraform_modules_path }}/terraform-openstack-tor-bridge"
version = "0.0.7"
context = module.label_{{ bridgeconf.group.id }}.context context = module.label_{{ bridgeconf.group.id }}.context
name = "br" name = "br"
attributes = ["{{ bridge.id }}"] attributes = ["{{ bridge.id }}"]

3
app/terraform/bridge/hcloud.py
View file

@ -64,8 +64,7 @@ class BridgeHcloudAutomation(BridgeAutomation):
} }
module "bridge_{{ bridge.id }}" { module "bridge_{{ bridge.id }}" {
source = "sr2c/tor-bridge/hcloud" source = "{{ terraform_modules_path }}/terraform-hcloud-tor-bridge"
version = "0.0.3"
datacenter = one(random_shuffle.datacenter_{{ bridge.id }}.result) datacenter = one(random_shuffle.datacenter_{{ bridge.id }}.result)
context = module.label_{{ bridgeconf.group.id }}.context context = module.label_{{ bridgeconf.group.id }}.context
name = "br" name = "br"

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

@ -84,8 +84,7 @@ class BridgeOvhAutomation(BridgeAutomation):
} }
module "bridge_{{ bridge.id }}" { module "bridge_{{ bridge.id }}" {
source = "sr2c/tor-bridge/openstack" source = "{{ terraform_modules_path }}/terraform-openstack-tor-bridge"
version = "0.0.7"
region = one(random_shuffle.region_{{ bridge.id }}.result) region = one(random_shuffle.region_{{ bridge.id }}.result)
context = module.label_{{ bridgeconf.group.id }}.context context = module.label_{{ bridgeconf.group.id }}.context
name = "br" name = "br"

1
app/terraform/list/__init__.py
View file

@ -1,5 +1,6 @@
from collections.abc import Mapping, Sequence from collections.abc import Mapping, Sequence
import json import json
import os
from typing import List, Any from typing import List, Any
from app import app from app import app