diff options
author | 2021-10-06 12:53:37 +0000 | |
---|---|---|
committer | 2021-10-06 13:04:54 +0000 | |
commit | 6f9f70d7bb1bbed37ff1495c20d11a03b82b9951 (patch) | |
tree | d46a92679a3a9051df33f6797144153384834fab /fdio.infra.terraform/2n_aws_c5n/deploy | |
parent | 37b01d1946880b96c348d8427ca6bb0d7fe219a3 (diff) |
feat(Packer): Introduce AMI packer images
Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I471069fd4cc10a0627434a60b4627d1bd0e192b8
Diffstat (limited to 'fdio.infra.terraform/2n_aws_c5n/deploy')
-rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/deploy/main.tf | 96 | ||||
-rw-r--r-- | fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf | 9 |
2 files changed, 55 insertions, 50 deletions
diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf index 1ea7e50152..db1463e788 100644 --- a/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf +++ b/fdio.infra.terraform/2n_aws_c5n/deploy/main.tf @@ -220,7 +220,7 @@ data "aws_network_interface" "tg_if2" { # 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 @@ -245,7 +245,7 @@ resource "aws_instance" "tg" { 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 @@ -307,29 +307,29 @@ resource "null_resource" "deploy_tg" { 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 - } - } - } - - 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" { @@ -348,29 +348,29 @@ resource "null_resource" "deploy_dut1" { 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 = ["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" { diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf index 6e9ffd183d..57c5b69f8e 100644 --- a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf +++ b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf @@ -7,8 +7,13 @@ variable "vault-name" { default = "dynamic-aws-creds-vault-admin" } -variable "ami_image" { - description = "AWS AMI image name" +variable "ami_image_tg" { + description = "AWS AMI image name for TG" + type = string +} + +variable "ami_image_sut" { + description = "AWS AMI image name for SUT" type = string } |