From 6adc9521fd4baadc15b2b0f5b87a6b5b8671153c Mon Sep 17 00:00:00 2001 From: Michael Barroco Date: Fri, 8 Dec 2023 09:22:49 -0500 Subject: [PATCH] Manage operations/ci/aws-1/variables.tf with utility --- .../modules/terraform-aws-dss/terraform.tfvars | 18 ------------------ deploy/infrastructure/utils/variables.py | 3 +++ 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 deploy/infrastructure/modules/terraform-aws-dss/terraform.tfvars diff --git a/deploy/infrastructure/modules/terraform-aws-dss/terraform.tfvars b/deploy/infrastructure/modules/terraform-aws-dss/terraform.tfvars deleted file mode 100644 index 40bd9b004..000000000 --- a/deploy/infrastructure/modules/terraform-aws-dss/terraform.tfvars +++ /dev/null @@ -1,18 +0,0 @@ -aws_region = "eu-west-1" -cluster_name = "dss-1" -aws_route53_zone_id = "Z01554482LNPDVY7FW95I" -app_hostname = "dss.aws-interuss.uspace.dev" -aws_instance_type = "t3.medium" -crdb_hostname_suffix = "db.aws-interuss.uspace.dev" -node_count = 3 - -aws_kubernetes_storage_class = "gp2" - -# DSS configuration -image = "latest" -authorization = { - public_key_pem_path = "/test-certs/auth2.pem" -} -should_init = true -crdb_locality = "interuss_dss-aws-ew1" -crdb_external_nodes = [] diff --git a/deploy/infrastructure/utils/variables.py b/deploy/infrastructure/utils/variables.py index 17ab38a3e..633686634 100755 --- a/deploy/infrastructure/utils/variables.py +++ b/deploy/infrastructure/utils/variables.py @@ -85,6 +85,9 @@ "../dependencies/terraform-aws-kubernetes": AWS_KUBERNETES_VARIABLES, "../dependencies/terraform-google-kubernetes": GOOGLE_KUBERNETES_VARIABLES, "../dependencies/terraform-commons-dss": COMMONS_DSS_VARIABLES, + "../../operations/ci/aws-1": list( + dict.fromkeys(AWS_MODULE_VARIABLES) + ) }