Code Review / csit.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
feat(Packer): Introduce AMI packer images
[csit.git] / fdio.infra.terraform / 2n_aws_c5n / deploy / main.tf
diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf
index 9bac6a7..db1463e 100644 (file)
--- a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf
+++ b/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf
@@ -1,226 +1,226 @@
 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                = {
-    "Name"            = "${var.resources_name_prefix}_${var.testbed_name}-vpc"
-    "Environment"     = var.environment_name
+  tags = {
+    "Name"        = "${var.resources_name_prefix}_${var.testbed_name}-vpc"
+    "Environment" = var.environment_name
   }
 }
 
 resource "aws_security_group" "CSITSG" {
-  name                = "${var.resources_name_prefix}_${var.testbed_name}-sg"
-  description         = "Allow inbound traffic"
-  vpc_id              = aws_vpc.CSITVPC.id
-  depends_on          = [aws_vpc.CSITVPC]
+  name        = "${var.resources_name_prefix}_${var.testbed_name}-sg"
+  description = "Allow inbound traffic"
+  vpc_id      = aws_vpc.CSITVPC.id
+  depends_on  = [aws_vpc.CSITVPC]
 
   ingress {
-    from_port         = 22
-    to_port           = 22
-    protocol          = "tcp"
-    cidr_blocks       = ["0.0.0.0/0"]
+    from_port   = 22
+    to_port     = 22
+    protocol    = "tcp"
+    cidr_blocks = ["0.0.0.0/0"]
   }
 
   ingress {
-    from_port         = 0
-    to_port           = 0
-    protocol          = -1
-    self              = true
+    from_port = 0
+    to_port   = 0
+    protocol  = -1
+    self      = true
   }
 
   egress {
-    from_port         = 0
-    to_port           = 0
-    protocol          = "-1"
-    cidr_blocks       = ["0.0.0.0/0"]
+    from_port   = 0
+    to_port     = 0
+    protocol    = "-1"
+    cidr_blocks = ["0.0.0.0/0"]
   }
 
   tags = {
-    "Name"            = "${var.resources_name_prefix}_${var.testbed_name}-sg"
-    "Environment"     = var.environment_name
+    "Name"        = "${var.resources_name_prefix}_${var.testbed_name}-sg"
+    "Environment" = var.environment_name
   }
 }
 
 resource "aws_vpc_ipv4_cidr_block_association" "b" {
-  vpc_id              = aws_vpc.CSITVPC.id
-  cidr_block          = var.vpc_cidr_b
-  depends_on          = [aws_vpc.CSITVPC]
+  vpc_id     = aws_vpc.CSITVPC.id
+  cidr_block = var.vpc_cidr_b
+  depends_on = [aws_vpc.CSITVPC]
 }
 resource "aws_vpc_ipv4_cidr_block_association" "c" {
-  vpc_id              = aws_vpc.CSITVPC.id
-  cidr_block          = var.vpc_cidr_c
-  depends_on          = [aws_vpc.CSITVPC]
+  vpc_id     = aws_vpc.CSITVPC.id
+  cidr_block = var.vpc_cidr_c
+  depends_on = [aws_vpc.CSITVPC]
 }
 resource "aws_vpc_ipv4_cidr_block_association" "d" {
-  vpc_id              = aws_vpc.CSITVPC.id
-  cidr_block          = var.vpc_cidr_d
-  depends_on          = [aws_vpc.CSITVPC]
+  vpc_id     = aws_vpc.CSITVPC.id
+  cidr_block = var.vpc_cidr_d
+  depends_on = [aws_vpc.CSITVPC]
 }
 
 # Subnets
 resource "aws_subnet" "mgmt" {
-  vpc_id              = aws_vpc.CSITVPC.id
-  cidr_block          = var.vpc_cidr_mgmt
-  availability_zone   = var.avail_zone
-  depends_on          = [aws_vpc.CSITVPC]
+  vpc_id            = aws_vpc.CSITVPC.id
+  cidr_block        = var.vpc_cidr_mgmt
+  availability_zone = var.avail_zone
+  depends_on        = [aws_vpc.CSITVPC]
 
   tags = {
-    "Environment"     = var.environment_name
+    "Environment" = var.environment_name
   }
 }
 resource "aws_subnet" "b" {
-  vpc_id              = aws_vpc.CSITVPC.id
-  cidr_block          = var.vpc_cidr_b
-  availability_zone   = var.avail_zone
-  depends_on          = [aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.b]
+  vpc_id            = aws_vpc.CSITVPC.id
+  cidr_block        = var.vpc_cidr_b
+  availability_zone = var.avail_zone
+  depends_on        = [aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.b]
 
   tags = {
-    "Environment"     = var.environment_name
+    "Environment" = var.environment_name
   }
 }
 resource "aws_subnet" "c" {
-  vpc_id              = aws_vpc.CSITVPC.id
-  cidr_block          = var.vpc_cidr_c
-  availability_zone   = var.avail_zone
-  depends_on          = [aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.c]
+  vpc_id            = aws_vpc.CSITVPC.id
+  cidr_block        = var.vpc_cidr_c
+  availability_zone = var.avail_zone
+  depends_on        = [aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.c]
 
   tags = {
-    "Environment"     = var.environment_name
+    "Environment" = var.environment_name
   }
 }
 resource "aws_subnet" "d" {
-  vpc_id              = aws_vpc.CSITVPC.id
-  cidr_block          = var.vpc_cidr_d
-  availability_zone   = var.avail_zone
-  depends_on          = [aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.d]
+  vpc_id            = aws_vpc.CSITVPC.id
+  cidr_block        = var.vpc_cidr_d
+  availability_zone = var.avail_zone
+  depends_on        = [aws_vpc.CSITVPC, aws_vpc_ipv4_cidr_block_association.d]
 
   tags = {
-    "Environment"     = var.environment_name
+    "Environment" = var.environment_name
   }
 }
 
 resource "aws_internet_gateway" "CSITGW" {
-  vpc_id              = aws_vpc.CSITVPC.id
-  depends_on          = [aws_vpc.CSITVPC]
+  vpc_id     = aws_vpc.CSITVPC.id
+  depends_on = [aws_vpc.CSITVPC]
 
   tags = {
-    "Environment"     = var.environment_name
+    "Environment" = var.environment_name
   }
 }
 
 # SSH keypair
 # Temporary key for provisioning only
 resource "tls_private_key" "CSITTLS" {
-  algorithm           = "RSA"
-  rsa_bits            = 4096
+  algorithm = "RSA"
+  rsa_bits  = 4096
 }
 resource "aws_key_pair" "CSITKP" {
-  key_name            = "${var.resources_name_prefix}_${var.testbed_name}-key"
-  public_key          = tls_private_key.CSITTLS.public_key_openssh
+  key_name   = "${var.resources_name_prefix}_${var.testbed_name}-key"
+  public_key = tls_private_key.CSITTLS.public_key_openssh
 }
 
 resource "aws_placement_group" "CSITPG" {
-  name                = "${var.resources_name_prefix}_${var.testbed_name}-pg"
-  strategy            = "cluster"
+  name     = "${var.resources_name_prefix}_${var.testbed_name}-pg"
+  strategy = "cluster"
 }
 
 # NICs
 resource "aws_network_interface" "dut1_if1" {
-  subnet_id           = aws_subnet.b.id
-  source_dest_check   = false
-  private_ip          = var.dut1_if1_ip
-  private_ips         = [var.dut1_if1_ip]
-  security_groups     = [aws_security_group.CSITSG.id]
-  depends_on          = [aws_vpc.CSITVPC, aws_subnet.b, aws_instance.dut1]
+  subnet_id         = aws_subnet.b.id
+  source_dest_check = false
+  private_ip        = var.dut1_if1_ip
+  private_ips       = [var.dut1_if1_ip]
+  security_groups   = [aws_security_group.CSITSG.id]
+  depends_on        = [aws_vpc.CSITVPC, aws_subnet.b, aws_instance.dut1]
 
   attachment {
-    instance          = aws_instance.dut1.id
-    device_index      = 1
+    instance     = aws_instance.dut1.id
+    device_index = 1
   }
 
   tags = {
-    "Environment"     = var.environment_name
+    "Environment" = var.environment_name
   }
 }
 
 resource "aws_network_interface" "dut1_if2" {
-  subnet_id           = aws_subnet.d.id
-  source_dest_check   = false
-  private_ip          = var.dut1_if2_ip
-  private_ips         = [var.dut1_if2_ip]
-  security_groups     = [aws_security_group.CSITSG.id]
-  depends_on          = [aws_vpc.CSITVPC, aws_subnet.d, aws_instance.dut1]
+  subnet_id         = aws_subnet.d.id
+  source_dest_check = false
+  private_ip        = var.dut1_if2_ip
+  private_ips       = [var.dut1_if2_ip]
+  security_groups   = [aws_security_group.CSITSG.id]
+  depends_on        = [aws_vpc.CSITVPC, aws_subnet.d, aws_instance.dut1]
 
   attachment {
-    instance          = aws_instance.dut1.id
-    device_index      = 2
+    instance     = aws_instance.dut1.id
+    device_index = 2
   }
 
   tags = {
-    "Environment"     = var.environment_name
+    "Environment" = var.environment_name
   }
 }
 
 resource "aws_network_interface" "tg_if1" {
-  subnet_id           = aws_subnet.b.id
-  source_dest_check   = false
-  private_ip          = var.tg_if1_ip
-  private_ips         = [var.tg_if1_ip]
-  security_groups     = [aws_security_group.CSITSG.id]
-  depends_on          = [aws_vpc.CSITVPC, aws_subnet.b, aws_instance.tg]
+  subnet_id         = aws_subnet.b.id
+  source_dest_check = false
+  private_ip        = var.tg_if1_ip
+  private_ips       = [var.tg_if1_ip]
+  security_groups   = [aws_security_group.CSITSG.id]
+  depends_on        = [aws_vpc.CSITVPC, aws_subnet.b, aws_instance.tg]
 
   attachment {
-    instance          = aws_instance.tg.id
-    device_index      = 1
+    instance     = aws_instance.tg.id
+    device_index = 1
   }
 
-  tags                = {
-    "Environment"     = var.environment_name
+  tags = {
+    "Environment" = var.environment_name
   }
 }
 
 resource "aws_network_interface" "tg_if2" {
-  subnet_id           = aws_subnet.d.id
-  source_dest_check   = false
-  private_ip          = var.tg_if2_ip
-  private_ips         = [var.tg_if2_ip]
-  security_groups     = [aws_security_group.CSITSG.id]
-  depends_on          = [aws_vpc.CSITVPC, aws_subnet.d, aws_instance.tg]
+  subnet_id         = aws_subnet.d.id
+  source_dest_check = false
+  private_ip        = var.tg_if2_ip
+  private_ips       = [var.tg_if2_ip]
+  security_groups   = [aws_security_group.CSITSG.id]
+  depends_on        = [aws_vpc.CSITVPC, aws_subnet.d, aws_instance.tg]
 
   attachment {
-    instance          = aws_instance.tg.id
-    device_index      = 2
+    instance     = aws_instance.tg.id
+    device_index = 2
   }
 
-  tags                = {
-    "Environment"     = var.environment_name
+  tags = {
+    "Environment" = var.environment_name
   }
 }
 
 data "aws_network_interface" "dut1_if1" {
-  id                  = aws_network_interface.dut1_if1.id
+  id = aws_network_interface.dut1_if1.id
 }
 
 data "aws_network_interface" "dut1_if2" {
-  id                  = aws_network_interface.dut1_if2.id
+  id = aws_network_interface.dut1_if2.id
 }
 
 data "aws_network_interface" "tg_if1" {
-  id                  = aws_network_interface.tg_if1.id
+  id = aws_network_interface.tg_if1.id
 }
 
 data "aws_network_interface" "tg_if2" {
-  id                  = aws_network_interface.tg_if2.id
+  id = aws_network_interface.tg_if2.id
 }
 
 # Instances
 resource "aws_instance" "tg" {
   depends_on                           = [aws_vpc.CSITVPC, aws_placement_group.CSITPG]
-  ami                                  = var.ami_image
+  ami                                  = var.ami_image_tg
   availability_zone                    = var.avail_zone
   instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior
   instance_type                        = var.instance_type
@@ -238,14 +238,14 @@ resource "aws_instance" "tg" {
   }
 
   tags = {
-    "Name"            = "${var.resources_name_prefix}_${var.testbed_name}-tg"
-    "Environment"     = var.environment_name
+    "Name"        = "${var.resources_name_prefix}_${var.testbed_name}-tg"
+    "Environment" = var.environment_name
   }
 }
 
 resource "aws_instance" "dut1" {
   depends_on                           = [aws_vpc.CSITVPC, aws_placement_group.CSITPG, aws_instance.tg]
-  ami                                  = var.ami_image
+  ami                                  = var.ami_image_sut
   availability_zone                    = var.avail_zone
   instance_initiated_shutdown_behavior = var.instance_initiated_shutdown_behavior
   instance_type                        = var.instance_type
@@ -263,8 +263,8 @@ resource "aws_instance" "dut1" {
   }
 
   tags = {
-    "Name"            = "${var.resources_name_prefix}_${var.testbed_name}-dut1"
-    "Environment"     = var.environment_name
+    "Name"        = "${var.resources_name_prefix}_${var.testbed_name}-dut1"
+    "Environment" = var.environment_name
   }
 }
 
@@ -292,7 +292,7 @@ resource "aws_route" "dummy-trex-port-1" {
 
 # Deployment/Ansible
 resource "null_resource" "deploy_tg" {
-  depends_on             = [
+  depends_on = [
     aws_instance.tg,
     aws_network_interface.tg_if1,
     aws_network_interface.tg_if2,
@@ -302,38 +302,38 @@ resource "null_resource" "deploy_tg" {
   ]
 
   connection {
-    user                 = "ubuntu"
-    host                 = aws_instance.tg.public_ip
-    private_key          = tls_private_key.CSITTLS.private_key_pem
-  }
-
-  provisioner "remote-exec" {
-    inline               = var.first_run_commands
-  }
-
-  provisioner "ansible" {
-    plays {
-      playbook {
-        file_path        = var.ansible_file_path
-        force_handlers   = true
-      }
-      hosts              = ["tg_aws"]
-      extra_vars         = {
-        ansible_ssh_pass           = var.ansible_provision_pwd
-        ansible_python_interpreter = var.ansible_python_executable
-        aws                        = true
-      }
-    }
+    user        = "ubuntu"
+    host        = aws_instance.tg.public_ip
+    private_key = tls_private_key.CSITTLS.private_key_pem
   }
 
-  provisioner "remote-exec" {
-    on_failure           = continue
-    inline               = ["sudo reboot"]
-  }
+#  provisioner "remote-exec" {
+#    inline = var.first_run_commands
+#  }
+#
+#  provisioner "ansible" {
+#    plays {
+#      playbook {
+#        file_path      = var.ansible_file_path
+#        force_handlers = true
+#      }
+#      hosts = ["tg_aws"]
+#      extra_vars = {
+#        ansible_ssh_pass           = var.ansible_provision_pwd
+#        ansible_python_interpreter = var.ansible_python_executable
+#        aws                        = true
+#      }
+#    }
+#  }
+#
+#  provisioner "remote-exec" {
+#    on_failure = continue
+#    inline     = ["sudo reboot"]
+#  }
 }
 
 resource "null_resource" "deploy_dut1" {
-  depends_on             = [
+  depends_on = [
     aws_instance.tg,
     aws_network_interface.tg_if1,
     aws_network_interface.tg_if2,
@@ -343,46 +343,46 @@ resource "null_resource" "deploy_dut1" {
   ]
 
   connection {
-    user                 = "ubuntu"
-    host                 = aws_instance.dut1.public_ip
-    private_key          = tls_private_key.CSITTLS.private_key_pem
-  }
-
-  provisioner "remote-exec" {
-    inline               = var.first_run_commands
+    user        = "ubuntu"
+    host        = aws_instance.dut1.public_ip
+    private_key = tls_private_key.CSITTLS.private_key_pem
   }
 
-  provisioner "ansible" {
-    plays {
-      playbook {
-        file_path        = var.ansible_file_path
-        force_handlers   = true
-      }
-      hosts              = ["sut_aws"]
-      extra_vars         = {
-        ansible_ssh_pass           = var.ansible_provision_pwd
-        ansible_python_interpreter = var.ansible_python_executable
-        aws                        = true
-      }
-    }
-  }
-
-  provisioner "remote-exec" {
-    on_failure           = continue
-    inline               = ["sudo reboot"]
-  }
+#  provisioner "remote-exec" {
+#    inline = var.first_run_commands
+#  }
+#
+#  provisioner "ansible" {
+#    plays {
+#      playbook {
+#        file_path      = var.ansible_file_path
+#        force_handlers = true
+#      }
+#      hosts = ["sut_aws"]
+#      extra_vars = {
+#        ansible_ssh_pass           = var.ansible_provision_pwd
+#        ansible_python_interpreter = var.ansible_python_executable
+#        aws                        = true
+#      }
+#    }
+#  }
+#
+#  provisioner "remote-exec" {
+#    on_failure = continue
+#    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"]
-      extra_vars         = {
+      hosts = ["local"]
+      extra_vars = {
         ansible_python_interpreter = var.ansible_python_executable
         testbed_name               = var.testbed_name
         cloud_topology             = var.topology_name
Integration tests