diff options
| author |   pmikus <peter.mikus@protonmail.ch> | 2022-09-22 13:53:51 +0200 |
|---|---|---|
| committer | Peter Mikus <peter.mikus@protonmail.ch> | 2022-09-22 12:58:05 +0000 |
| commit | 8d068bf25faf8484133a12b996787e1cde67efd5 (patch) | |
| tree | b39bbc10337f3aa2d4568505ba911ce519683f8c /fdio.infra.terraform | |
| parent | a542284c5fdc156c12f7e5f54d5340bc778cbe87 (diff) | |
fix(terraform): AWS
Signed-off-by: pmikus <peter.mikus@protonmail.ch>
Change-Id: Id762a0848d66a1c1264fdf94be13c3a091bb6d78
Diffstat (limited to 'fdio.infra.terraform')
6 files changed, 8 insertions, 37 deletions
diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/main.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/main.tf index 699992db98..892aed3956 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/main.tf +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/main.tf @@ -51,8 +51,6 @@ module "subnet_d" { # Create Private Key resource "tls_private_key" "private_key" { algorithm = var.private_key_algorithm - ecdsa_curve = var.private_key_ecdsa_curve - rsa_bits = var.private_key_rsa_bits } # Create Key Pair diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf index e809feb90c..e35dc65b93 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf @@ -24,19 +24,7 @@ variable "testbed_name" { variable "private_key_algorithm" { description = "The name of the algorithm to use for the key." type = string - default = "RSA" -} - -variable "private_key_ecdsa_curve" { - description = "When algorithm is ECDSA, the name of the elliptic curve to use." - type = string - default = "P521" -} - -variable "private_key_rsa_bits" { - description = "When algorithm is RSA, the size of the generated RSA key in bits." - type = number - default = 4096 + default = "ED25519" } # Variables for Placement Group diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/versions.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/versions.tf index 0eead1fc01..8bbe0c431c 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/versions.tf +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/versions.tf @@ -6,14 +6,14 @@ terraform { } null = { source = "hashicorp/null" - version = "~> 3.1.0" + version = ">= 3.1.1" } tls = { source = "hashicorp/tls" - version = "~> 3.1.0" + version = ">= 4.0.3" } vault = { - version = ">=2.22.1" + version = ">= 2.22.1" } } required_version = ">= 1.0.4" diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/main.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/main.tf index bb8efffc96..255f95ac02 100644 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/main.tf +++ b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/main.tf @@ -61,8 +61,6 @@ module "subnet_d" { # Create Private Key resource "tls_private_key" "private_key" { algorithm = var.private_key_algorithm - ecdsa_curve = var.private_key_ecdsa_curve - rsa_bits = var.private_key_rsa_bits } # Create Key Pair diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf index 3f6a96d66f..ef7ec36cd2 100644 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf +++ b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf @@ -24,20 +24,7 @@ variable "testbed_name" { variable "private_key_algorithm" { description = "The name of the algorithm to use for the key." type = string - default = "RSA" -} - -variable "private_key_ecdsa_curve" { - description = "When algorithm is ECDSA, the name of the elliptic curve to use." - type = string - default = "P521" -} - -variable "private_key_rsa_bits" { - description = "When algorithm is RSA, the size of the generated RSA key in bits." - type = number - default = 4096 -} + default = "ED25519" # Variables for Placement Group variable "placement_group_strategy" { diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/versions.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/versions.tf index 0eead1fc01..8bbe0c431c 100644 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/versions.tf +++ b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/versions.tf @@ -6,14 +6,14 @@ terraform { } null = { source = "hashicorp/null" - version = "~> 3.1.0" + version = ">= 3.1.1" } tls = { source = "hashicorp/tls" - version = "~> 3.1.0" + version = ">= 4.0.3" } vault = { - version = ">=2.22.1" + version = ">= 2.22.1" } } required_version = ">= 1.0.4" |