From: pmikus <pmikus@cisco.com>
Date: Fri, 29 Oct 2021 06:58:05 +0000 (+0000)
Subject: feat(Terraform): AWS account migration
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=46db3f826b74ad54f8ef1a1ba54c17200f6482ce

feat(Terraform): AWS account migration

Signed-off-by: pmikus <pmikus@cisco.com>
Change-Id: I2aeece4296aff18bf87304312a26368df267fac0
---

diff --git a/fdio.infra.packer/aws_c5n/ubuntu_focal.pkr.hcl b/fdio.infra.packer/aws_c5n/ubuntu_focal.pkr.hcl
index 4a09160261..06d849abb3 100644
--- a/fdio.infra.packer/aws_c5n/ubuntu_focal.pkr.hcl
+++ b/fdio.infra.packer/aws_c5n/ubuntu_focal.pkr.hcl
@@ -10,7 +10,7 @@ packer {
 variable "first_run_commands" {
   description = "Commands to run before deployment via remote-exec"
   type        = list(string)
-  default     = [
+  default = [
     ""
   ]
 }
@@ -18,7 +18,7 @@ variable "first_run_commands" {
 variable "last_run_commands" {
   description = "Commands to run after deployment via remote-exec"
   type        = list(string)
-  default     = [
+  default = [
     "sudo sed -i 's/Unattended-Upgrade \"1\"/Unattended-Upgrade \"0\"/g' /etc/apt/apt.conf.d/20auto-upgrades"
   ]
 }
@@ -48,10 +48,10 @@ variable "ansible_provision_pwd" {
 }
 
 source "amazon-ebs" "csit_c5n_ubuntu_focal_sut" {
-  ami_name         = "csit_c5n_ubuntu_focal_sut"
-  ami_description  = "CSIT SUT image based on Ubuntu Focal"
-  ena_support      = true
-  instance_type    = "c5n.4xlarge"
+  ami_name        = "csit_c5n_ubuntu_focal_sut"
+  ami_description = "CSIT SUT image based on Ubuntu Focal"
+  ena_support     = true
+  instance_type   = "c5n.4xlarge"
   launch_block_device_mappings {
     device_name = "/dev/sda1"
     volume_size = 40
@@ -65,10 +65,10 @@ source "amazon-ebs" "csit_c5n_ubuntu_focal_sut" {
 }
 
 source "amazon-ebs" "csit_c5n_ubuntu_focal_tg" {
-  ami_name         = "csit_c5n_ubuntu_focal_tg"
-  ami_description  = "CSIT TG image based on Ubuntu Focal"
-  ena_support      = true
-  instance_type    = "c5n.4xlarge"
+  ami_name        = "csit_c5n_ubuntu_focal_tg"
+  ami_description = "CSIT TG image based on Ubuntu Focal"
+  ena_support     = true
+  instance_type   = "c5n.4xlarge"
   launch_block_device_mappings {
     device_name = "/dev/sda1"
     volume_size = 40
diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf
index 6263fb46cb..b25add26e5 100644
--- a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf
+++ b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf
@@ -4,7 +4,7 @@ variable "region" {
 }
 
 variable "vault-name" {
-  default = "dynamic-aws-creds-vault-admin"
+  default = "dynamic-aws-creds-vault-fdio"
 }
 
 variable "ami_image_tg" {
diff --git a/fdio.infra.terraform/2n_aws_c5n/variables.tf b/fdio.infra.terraform/2n_aws_c5n/variables.tf
index 4854978c7b..2673442af2 100644
--- a/fdio.infra.terraform/2n_aws_c5n/variables.tf
+++ b/fdio.infra.terraform/2n_aws_c5n/variables.tf
@@ -5,7 +5,7 @@ variable "region" {
 }
 
 variable "vault-name" {
-  default = "dynamic-aws-creds-vault-admin"
+  default = "dynamic-aws-creds-vault-fdio"
 }
 
 variable "avail_zone" {
@@ -19,7 +19,7 @@ variable "ami_image_tg" {
   # kernel 5.4.0-1035-aws (~5.4.0-65)
   description = "AWS AMI image ID"
   type        = string
-  default     = "ami-038ede035b200bf55"
+  default     = "ami-0c2d02d48236a23dd"
 }
 
 variable "ami_image_sut" {
@@ -27,7 +27,7 @@ variable "ami_image_sut" {
   # kernel 5.4.0-1035-aws (~5.4.0-65)
   description = "AWS AMI image ID"
   type        = string
-  default     = "ami-08675923394f0c300"
+  default     = "ami-05ea90e57d2df4368"
 }
 
 variable "instance_initiated_shutdown_behavior" {
diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf
index ca87db759c..543599f216 100644
--- a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf
+++ b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf
@@ -4,7 +4,7 @@ variable "region" {
 }
 
 variable "vault-name" {
-  default = "dynamic-aws-creds-vault-admin"
+  default = "dynamic-aws-creds-vault-fdio"
 }
 
 variable "ami_image_tg" {
diff --git a/fdio.infra.terraform/3n_aws_c5n/variables.tf b/fdio.infra.terraform/3n_aws_c5n/variables.tf
index 299b3c250b..9e47b26295 100644
--- a/fdio.infra.terraform/3n_aws_c5n/variables.tf
+++ b/fdio.infra.terraform/3n_aws_c5n/variables.tf
@@ -5,7 +5,7 @@ variable "region" {
 }
 
 variable "vault-name" {
-  default = "dynamic-aws-creds-vault-admin"
+  default = "dynamic-aws-creds-vault-fdio"
 }
 
 variable "avail_zone" {
@@ -19,7 +19,7 @@ variable "ami_image_tg" {
   # kernel 5.4.0-1035-aws (~5.4.0-65)
   description = "AWS AMI image ID"
   type        = string
-  default     = "ami-038ede035b200bf55"
+  default     = "ami-0c2d02d48236a23dd"
 }
 
 variable "ami_image_sut" {
@@ -27,7 +27,7 @@ variable "ami_image_sut" {
   # kernel 5.4.0-1035-aws (~5.4.0-65)
   description = "AWS AMI image ID"
   type        = string
-  default     = "ami-08675923394f0c300"
+  default     = "ami-05ea90e57d2df4368"
 }
 
 variable "instance_initiated_shutdown_behavior" {