aboutsummaryrefslogtreecommitdiffstats
path: root/fdio.infra.terraform
diff options
context:
space:
mode:
Diffstat (limited to 'fdio.infra.terraform')
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-c7gn/main.tf2
-rw-r--r--fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf20
-rw-r--r--fdio.infra.terraform/terraform-aws-3n-c7gn/main.tf2
-rw-r--r--fdio.infra.terraform/terraform-aws-3n-c7gn/variables.tf8
4 files changed, 10 insertions, 22 deletions
diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/main.tf b/fdio.infra.terraform/terraform-aws-2n-c7gn/main.tf
index 5711d7389e..5d9899773b 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c7gn/main.tf
+++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/main.tf
@@ -5,7 +5,7 @@ data "vault_aws_access_credentials" "creds" {
locals {
ansible_python_executable = "/usr/bin/python3"
- availability_zone = "eu-central-1b"
+ availability_zone = "${var.region}a"
name = "csit-vpc"
environment = "csit-vpc-environment"
key_pair_key_name = "${var.resource_prefix}-${var.testbed_name}-pk"
diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf b/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf
index 194a71d229..2a80b86936 100644
--- a/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf
@@ -5,7 +5,7 @@ variable "vault-name" {
variable "region" {
description = "AWS Region."
type = string
- default = "eu-central-1"
+ default = "eu-west-1"
}
variable "resource_prefix" {
@@ -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
@@ -50,7 +38,7 @@ variable "placement_group_strategy" {
variable "tg_ami" {
description = "AMI to use for the instance."
type = string
- default = "ami-07430bfa17fd4e597"
+ default = "ami-0b5aa26a6e4192705"
}
variable "tg_associate_public_ip_address" {
@@ -86,7 +74,7 @@ variable "tg_source_dest_check" {
variable "sut1_ami" {
description = "AMI to use for the instance."
type = string
- default = "ami-0cebabdc14ee56909"
+ default = "ami-08930f71bd0be1085"
}
variable "sut1_associate_public_ip_address" {
diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/main.tf b/fdio.infra.terraform/terraform-aws-3n-c7gn/main.tf
index fe443bc96c..68d2dd9be2 100644
--- a/fdio.infra.terraform/terraform-aws-3n-c7gn/main.tf
+++ b/fdio.infra.terraform/terraform-aws-3n-c7gn/main.tf
@@ -5,7 +5,7 @@ data "vault_aws_access_credentials" "creds" {
locals {
ansible_python_executable = "/usr/bin/python3"
- availability_zone = "eu-central-1a"
+ availability_zone = "${var.region}a"
name = "csit-vpc"
environment = "csit-vpc-environment"
key_pair_key_name = "${var.resource_prefix}-${var.testbed_name}-pk"
diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/variables.tf b/fdio.infra.terraform/terraform-aws-3n-c7gn/variables.tf
index f14d8bd2fc..3ad51afeba 100644
--- a/fdio.infra.terraform/terraform-aws-3n-c7gn/variables.tf
+++ b/fdio.infra.terraform/terraform-aws-3n-c7gn/variables.tf
@@ -5,7 +5,7 @@ variable "vault-name" {
variable "region" {
description = "AWS Region."
type = string
- default = "eu-central-1"
+ default = "eu-west-1"
}
variable "resource_prefix" {
@@ -38,7 +38,7 @@ variable "placement_group_strategy" {
variable "tg_ami" {
description = "AMI to use for the instance."
type = string
- default = "ami-07430bfa17fd4e597"
+ default = "ami-0b5aa26a6e4192705"
}
variable "tg_associate_public_ip_address" {
@@ -74,7 +74,7 @@ variable "tg_source_dest_check" {
variable "sut1_ami" {
description = "AMI to use for the instance."
type = string
- default = "ami-0cebabdc14ee56909"
+ default = "ami-08930f71bd0be1085"
}
variable "sut1_associate_public_ip_address" {
@@ -110,7 +110,7 @@ variable "sut1_source_dest_check" {
variable "sut2_ami" {
description = "AMI to use for the instance."
type = string
- default = "ami-0cebabdc14ee56909"
+ default = "ami-08930f71bd0be1085"
}
variable "sut2_associate_public_ip_address" {