X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=fdio.infra.terraform%2F3n_aws_c5n%2Fdeploy%2Fmain.tf;h=0969ca4abffcb61623646ec36cbc0aeef4620603;hb=80a4b408b1bec92f51813c5b758d7b2739f665ed;hp=d8968bf5fe68a1639b756cdda94aafa6add061d0;hpb=31f82bd3fcbd6299e2e411734767e29b7adb5982;p=csit.git

diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf
index d8968bf5fe..0969ca4abf 100644
--- a/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf
+++ b/fdio.infra.terraform/3n_aws_c5n/deploy/main.tf
@@ -1,5 +1,6 @@
-provider "aws" {
-  region = var.region
+data "vault_aws_access_credentials" "creds" {
+  backend = "${var.vault-name}-path"
+  role    = "${var.vault-name}-role"
 }
 
 resource "aws_vpc" "CSITVPC" {
@@ -262,17 +263,18 @@ data "aws_network_interface" "tg_if2" {
 
 # Instances
 resource "aws_instance" "tg" {
-  ami                         = var.ami_image
-  availability_zone           = var.avail_zone
-  instance_type               = var.instance_type
-  key_name                    = aws_key_pair.CSITKP.key_name
-  associate_public_ip_address = true
-  subnet_id                   = aws_subnet.mgmt.id
-  private_ip                  = var.tg_mgmt_ip
-  vpc_security_group_ids      = [aws_security_group.CSITSG.id]
-  placement_group             = aws_placement_group.CSITPG.id
-  source_dest_check           = false
-  # host_id                   = "1"
+  ami                                  = var.ami_image
+  availability_zone                    = var.avail_zone
+  instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior
+  instance_type                        = var.instance_type
+  key_name                             = aws_key_pair.CSITKP.key_name
+  associate_public_ip_address          = true
+  subnet_id                            = aws_subnet.mgmt.id
+  private_ip                           = var.tg_mgmt_ip
+  vpc_security_group_ids               = [aws_security_group.CSITSG.id]
+  placement_group                      = aws_placement_group.CSITPG.id
+  source_dest_check                    = false
+  # host_id                            = "1"
 
   depends_on = [
     aws_vpc.CSITVPC,
@@ -290,17 +292,18 @@ resource "aws_instance" "tg" {
 }
 
 resource "aws_instance" "dut1" {
-  ami                         = var.ami_image
-  availability_zone           = var.avail_zone
-  instance_type               = var.instance_type
-  key_name                    = aws_key_pair.CSITKP.key_name
-  associate_public_ip_address = true
-  subnet_id                   = aws_subnet.mgmt.id
-  private_ip                  = var.dut1_mgmt_ip
-  vpc_security_group_ids      = [aws_security_group.CSITSG.id]
-  placement_group             = aws_placement_group.CSITPG.id
-  source_dest_check           = false
-  # host_id                   = "2"
+  ami                                  = var.ami_image
+  availability_zone                    = var.avail_zone
+  instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior
+  instance_type                        = var.instance_type
+  key_name                             = aws_key_pair.CSITKP.key_name
+  associate_public_ip_address          = true
+  subnet_id                            = aws_subnet.mgmt.id
+  private_ip                           = var.dut1_mgmt_ip
+  vpc_security_group_ids               = [aws_security_group.CSITSG.id]
+  placement_group                      = aws_placement_group.CSITPG.id
+  source_dest_check                    = false
+  # host_id                            = "2"
 
   depends_on = [
     aws_vpc.CSITVPC,
@@ -398,7 +401,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
@@ -409,7 +412,7 @@ resource "null_resource" "deploy_tg" {
 
   provisioner "remote-exec" {
     on_failure = continue
-    inline = ["sudo reboot"]
+    inline     = ["sudo reboot"]
   }
 }
 
@@ -442,7 +445,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
@@ -453,7 +456,7 @@ resource "null_resource" "deploy_dut1" {
 
   provisioner "remote-exec" {
     on_failure = continue
-    inline = ["sudo reboot"]
+    inline     = ["sudo reboot"]
   }
 }
 
@@ -486,7 +489,7 @@ resource "null_resource" "deploy_dut2" {
         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
@@ -497,19 +500,19 @@ resource "null_resource" "deploy_dut2" {
 
   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, aws_instance.dut2 ]
+  depends_on = [aws_instance.tg, aws_instance.dut1, aws_instance.dut2]
 
   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