diff options
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/main.tf | 11 | ||||
| -rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/variables.tf | 18 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/main.tf | 11 | ||||
| -rw-r--r-- | fdio.infra.terraform/3n_aws_c5n/variables.tf | 18 | ||||
| -rw-r--r-- | resources/libraries/bash/function/common.sh | 3 |
5 files changed, 51 insertions, 10 deletions
diff --git a/fdio.infra.terraform/2n_aws_c5n/main.tf b/fdio.infra.terraform/2n_aws_c5n/main.tf index a39eff64a8..44ec177e99 100644 --- a/fdio.infra.terraform/2n_aws_c5n/main.tf +++ b/fdio.infra.terraform/2n_aws_c5n/main.tf @@ -1,12 +1,13 @@ module "deploy" { source = "./deploy" - # 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 + # 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" + topology_name = var.topology_name + environment_name = var.environment_name + resources_name_prefix = var.resources_name_prefix # AWS general region = var.region diff --git a/fdio.infra.terraform/2n_aws_c5n/variables.tf b/fdio.infra.terraform/2n_aws_c5n/variables.tf index 88ebda6d9d..c3d81bfbcc 100644 --- a/fdio.infra.terraform/2n_aws_c5n/variables.tf +++ b/fdio.infra.terraform/2n_aws_c5n/variables.tf @@ -33,3 +33,21 @@ variable "testbed_name" { type = string default = "testbed1" } + +variable "topology_name" { + description = "Topology name" + type = string + default = "2n_aws_c5n" +} + +variable "environment_name" { + description = "Environment name" + type = string + default = "CSIT-AWS" +} + +variable "resources_name_prefix" { + description = "Resources name prefix" + type = string + default = "CSIT_2n_aws_c5n" +} diff --git a/fdio.infra.terraform/3n_aws_c5n/main.tf b/fdio.infra.terraform/3n_aws_c5n/main.tf index ed87161eb5..abb60ce418 100644 --- a/fdio.infra.terraform/3n_aws_c5n/main.tf +++ b/fdio.infra.terraform/3n_aws_c5n/main.tf @@ -1,12 +1,13 @@ module "deploy" { source = "./deploy" - # 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 + # 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 = "3n_aws_c5n" - environment_name = "CSIT-AWS" - resources_name_prefix = "CSIT_3n_aws_c5n" + topology_name = var.topology_name + environment_name = var.environment_name + resources_name_prefix = var.resources_name_prefix # AWS general region = var.region diff --git a/fdio.infra.terraform/3n_aws_c5n/variables.tf b/fdio.infra.terraform/3n_aws_c5n/variables.tf index c87b1c3cfa..29a611adca 100644 --- a/fdio.infra.terraform/3n_aws_c5n/variables.tf +++ b/fdio.infra.terraform/3n_aws_c5n/variables.tf @@ -35,3 +35,21 @@ variable "testbed_name" { type = string default = "testbed1" } + +variable "topology_name" { + description = "Topology name" + type = string + default = "3n_aws_c5n" +} + +variable "environment_name" { + description = "Environment name" + type = string + default = "CSIT-AWS" +} + +variable "resources_name_prefix" { + description = "Resources name prefix" + type = string + default = "CSIT_3n_aws_c5n" +} diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index ff632a2e97..e56799e63c 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -606,6 +606,7 @@ function prepare_topology () { # Prepare virtual testbed topology if needed based on flavor. # Variables read: + # - TEST_CODE - String affecting test selection, usually jenkins job name. # - NODENESS - Node multiplicity of testbed, either "2n" or "3n". # - FLAVOR - Node flavor string, e.g. "clx" or "skx". # Functions called: @@ -618,10 +619,12 @@ function prepare_topology () { case_text="${NODENESS}_${FLAVOR}" case "${case_text}" in "2n_aws") + export TF_VAR_testbed_name="${TEST_CODE}" terraform_init || die "Failed to call terraform init." terraform_apply || die "Failed to call terraform apply." ;; "3n_aws") + export TF_VAR_testbed_name="${TEST_CODE}" terraform_init || die "Failed to call terraform init." terraform_apply || die "Failed to call terraform apply." ;; |