X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=fdio.infra.terraform%2F2n_aws_c5n%2Fdeploy%2Fmain.tf;h=1ea7e50152daa817c4cf1ca304ab79073a665710;hb=4fddb82d1d5190ea348b573f75347c46426182fd;hp=8ab8311220dd1d96d939346de044f5f2fca7a411;hpb=44784f12e7a1cfe42927bd301b90015ffa72b7d7;p=csit.git diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf index 8ab8311220..1ea7e50152 100644 --- a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf +++ b/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf @@ -1,12 +1,12 @@ data "vault_aws_access_credentials" "creds" { - backend = "${var.vault-name}-path" - role = "${var.vault-name}-role" + backend = "${var.vault-name}-path" + role = "${var.vault-name}-role" } resource "aws_vpc" "CSITVPC" { cidr_block = var.vpc_cidr_mgmt - tags = { + tags = { "Name" = "${var.resources_name_prefix}_${var.testbed_name}-vpc" "Environment" = var.environment_name } @@ -317,7 +317,7 @@ resource "null_resource" "deploy_tg" { file_path = var.ansible_file_path force_handlers = true } - hosts = ["tg_aws"] + hosts = ["tg_aws"] extra_vars = { ansible_ssh_pass = var.ansible_provision_pwd ansible_python_interpreter = var.ansible_python_executable @@ -328,7 +328,7 @@ resource "null_resource" "deploy_tg" { provisioner "remote-exec" { on_failure = continue - inline = ["sudo reboot"] + inline = ["sudo reboot"] } } @@ -358,7 +358,7 @@ resource "null_resource" "deploy_dut1" { file_path = var.ansible_file_path force_handlers = true } - hosts = ["sut_aws"] + hosts = ["sut_aws"] extra_vars = { ansible_ssh_pass = var.ansible_provision_pwd ansible_python_interpreter = var.ansible_python_executable @@ -369,19 +369,19 @@ resource "null_resource" "deploy_dut1" { provisioner "remote-exec" { on_failure = continue - inline = ["sudo reboot"] + inline = ["sudo reboot"] } } resource "null_resource" "deploy_topology" { - depends_on = [ aws_instance.tg, aws_instance.dut1 ] + depends_on = [aws_instance.tg, aws_instance.dut1] provisioner "ansible" { plays { playbook { file_path = var.ansible_topology_path } - hosts = ["local"] + hosts = ["local"] extra_vars = { ansible_python_interpreter = var.ansible_python_executable testbed_name = var.testbed_name