X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=fdio.infra.terraform%2F2n_aws_c5n%2Fmain.tf;h=1aebabd3decdebc186eb86b791e8380d683e03c0;hp=a73288d9e8663083bc70b45dcb7faab84a2b7a43;hb=44784f12e7a1cfe42927bd301b90015ffa72b7d7;hpb=c318223fcd266c0ee2982e803c44e193c2023054

diff --git a/fdio.infra.terraform/2n_aws_c5n/main.tf b/fdio.infra.terraform/2n_aws_c5n/main.tf
index a73288d9e8..1aebabd3de 100644
--- a/fdio.infra.terraform/2n_aws_c5n/main.tf
+++ b/fdio.infra.terraform/2n_aws_c5n/main.tf
@@ -1,19 +1,18 @@
 module "deploy" {
   source                    = "./deploy"
 
-  # TODO: Use ENV variable for testbed_name for dynamic deployment
-  testbed_name              = "testbed1"
+  # Parameters starting with var. can be set using "TF_VAR_*" environment variables
+  # or -var parameter when running "terraform apply", for default values see ./variables.tf
+  testbed_name              = var.testbed_name
   topology_name             = "2n_aws_c5n"
   environment_name          = "CSIT-AWS"
   resources_name_prefix     = "CSIT_2n_aws_c5n"
 
   # AWS general
-  region                    = "eu-central-1"
-  avail_zone                = "eu-central-1a"
-  instance_type             = "c5n.4xlarge"
-  ami_image                 = "ami-0b418580298265d5c"
-  # eu-central-1/bionic-18.04-amd64-hvm-ssd-20200112
-  # kernel 4.15.0-1057-aws (~4.15.0-74)
+  region                    = var.region
+  avail_zone                = var.avail_zone
+  instance_type             = var.instance_type
+  ami_image                 = var.ami_image
 
   # AWS Network
   vpc_cidr_mgmt             = "192.168.0.0/24"
@@ -34,8 +33,8 @@ module "deploy" {
 
   # Ansible
   ansible_python_executable = "/usr/bin/python3"
-  ansible_file_path         = "../../resources/tools/testbed-setup/ansible/site.yaml"
-  ansible_topology_path     = "../../resources/tools/testbed-setup/ansible/cloud_topology.yaml"
+  ansible_file_path         = "../../fdio.infra.ansible/site.yaml"
+  ansible_topology_path     = "../../fdio.infra.ansible/cloud_topology.yaml"
   ansible_provision_pwd     = "Csit1234"
 
   # First run