Infra: AWS Update to Ubuntu 20.04

- Change AMI image to Ubuntu 20.04
- Add calibration role
- Add AWS vfio-patch for kernel 5.8+
- Prepare root module's main.tf to be used with environment variables

Signed-off-by: Tomas Alexy <tomas.alexy@pantheon.tech>
Change-Id: I7db3f28ba573a5a8a1dc07179ef78ef34ce9ebf3

6 files changed, 88 insertions, 38 deletions

diff --git a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf
index d1ff1d6575..53efe6fb1d 100644
--- a/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf
+++ b/fdio.infra.terraform/2n_aws_c5n/deploy/variables.tf
@@ -1,37 +1,32 @@
 variable "region" {
   description = "AWS Region"
   type = string
-  default = "eu-central-1"
 }
 
 variable "ami_image" {
   description = "AWS AMI image name"
   type = string
-  default = "ami-0b418580298265d5c"
 }
 
 variable "testbed_name" {
   description = "Testbed name"
   type = string
-  default = "testbed1"
-}
-
-variable "topology_name" {
-  description = "Prefix used when creating a topology file"
-  type = string
-  default = "2n_aws_c5n"
 }
 
 variable "instance_type" {
   description = "AWS instance type"
   type = string
-  default = "c5n.4xlarge"
 }
 
 variable "avail_zone" {
   description = "AWS availability zone"
   type = string
-  default = "eu-central-1a"
+}
+
+variable "topology_name" {
+  description = "Prefix used when creating a topology file"
+  type = string
+  default = "2n_aws_c5n"
 }
 
 variable "environment_name" {
diff --git a/fdio.infra.terraform/2n_aws_c5n/main.tf b/fdio.infra.terraform/2n_aws_c5n/main.tf
index a73288d9e8..7a090675e7 100644
--- a/fdio.infra.terraform/2n_aws_c5n/main.tf
+++ b/fdio.infra.terraform/2n_aws_c5n/main.tf
@@ -1,19 +1,18 @@
 module "deploy" {
   source                    = "./deploy"
 
-  # TODO: Use ENV variable for testbed_name for dynamic deployment
-  testbed_name              = "testbed1"
+  # Parameters starting with var. can be set using "TF_VAR_*" environment variables
+  # or -var parameter when running "terraform apply", for default values see ./variables.tf
+  testbed_name              = var.testbed_name
   topology_name             = "2n_aws_c5n"
   environment_name          = "CSIT-AWS"
   resources_name_prefix     = "CSIT_2n_aws_c5n"
 
   # AWS general
-  region                    = "eu-central-1"
-  avail_zone                = "eu-central-1a"
-  instance_type             = "c5n.4xlarge"
-  ami_image                 = "ami-0b418580298265d5c"
-  # eu-central-1/bionic-18.04-amd64-hvm-ssd-20200112
-  # kernel 4.15.0-1057-aws (~4.15.0-74)
+  region                    = var.region
+  avail_zone                = var.avail_zone
+  instance_type             = var.instance_type
+  ami_image                 = var.ami_image
 
   # AWS Network
   vpc_cidr_mgmt             = "192.168.0.0/24"
diff --git a/fdio.infra.terraform/2n_aws_c5n/variables.tf b/fdio.infra.terraform/2n_aws_c5n/variables.tf
new file mode 100644
index 0000000000..15e718bdb0
--- /dev/null
+++ b/fdio.infra.terraform/2n_aws_c5n/variables.tf
@@ -0,0 +1,31 @@
+variable "region" {
+  description = "AWS Region"
+  type = string
+  default = "eu-central-1"
+}
+
+variable "avail_zone" {
+  description = "AWS availability zone"
+  type = string
+  default = "eu-central-1a"
+}
+
+variable "ami_image" {
+  # eu-central-1/focal-20.04-amd64-hvm-ssd-20210119.1
+  # kernel 5.4.0-1035-aws (~5.4.0-65)
+  description = "AWS AMI image ID"
+  type = string
+  default = "ami-0a875db8a031a9efb"
+}
+
+variable "instance_type" {
+  description = "AWS instance type"
+  type = string
+  default = "c5n.4xlarge"
+}
+
+variable "testbed_name" {
+  description = "Testbed name"
+  type = string
+  default = "testbed1"
+}
diff --git a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf
index f6fa83122f..38a9133eeb 100644
--- a/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf
+++ b/fdio.infra.terraform/3n_aws_c5n/deploy/variables.tf
@@ -1,37 +1,32 @@
 variable "region" {
   description = "AWS Region"
   type = string
-  default = "eu-central-1"
 }
 
 variable "ami_image" {
   description = "AWS AMI image name"
   type = string
-  default = "ami-0b418580298265d5c"
 }
 
 variable "testbed_name" {
   description = "Testbed name"
   type = string
-  default = "testbed1"
-}
-
-variable "topology_name" {
-  description = "Prefix used when creating a topology file"
-  type = string
-  default = "3n_aws_c5n"
 }
 
 variable "instance_type" {
   description = "AWS instance type"
   type = string
-  default = "c5n.4xlarge"
 }
 
 variable "avail_zone" {
   description = "AWS availability zone"
   type = string
-  default = "eu-central-1a"
+}
+
+variable "topology_name" {
+  description = "Prefix used when creating a topology file"
+  type = string
+  default = "3n_aws_c5n"
 }
 
 variable "environment_name" {
diff --git a/fdio.infra.terraform/3n_aws_c5n/main.tf b/fdio.infra.terraform/3n_aws_c5n/main.tf
index 0e757b89bb..0aca7af05a 100644
--- a/fdio.infra.terraform/3n_aws_c5n/main.tf
+++ b/fdio.infra.terraform/3n_aws_c5n/main.tf
@@ -1,19 +1,18 @@
 module "deploy" {
   source                    = "./deploy"
 
-  # TODO: Use ENV variable for testbed_name for dynamic deployment
-  testbed_name              = "testbed1"
+  # Parameters starting with var. can be set using "TF_VAR_*" environment variables
+  # or -var parameter when running "terraform apply", for default values see ./variables.tf
+  testbed_name              = var.testbed_name
   topology_name             = "3n_aws_c5n"
   environment_name          = "CSIT-AWS"
   resources_name_prefix     = "CSIT_3n_aws_c5n"
 
   # AWS general
-  region                    = "eu-central-1"
-  avail_zone                = "eu-central-1a"
-  instance_type             = "c5n.4xlarge"
-  ami_image                 = "ami-0b418580298265d5c"
-  # eu-central-1/bionic-18.04-amd64-hvm-ssd-20200112
-  # kernel 4.15.0-1057-aws (~4.15.0-74)
+  region                    = var.region
+  avail_zone                = var.avail_zone
+  instance_type             = var.instance_type
+  ami_image                 = var.ami_image
 
   # AWS Network
   vpc_cidr_mgmt             = "192.168.0.0/24"
diff --git a/fdio.infra.terraform/3n_aws_c5n/variables.tf b/fdio.infra.terraform/3n_aws_c5n/variables.tf
new file mode 100644
index 0000000000..15e718bdb0
--- /dev/null
+++ b/fdio.infra.terraform/3n_aws_c5n/variables.tf
@@ -0,0 +1,31 @@
+variable "region" {
+  description = "AWS Region"
+  type = string
+  default = "eu-central-1"
+}
+
+variable "avail_zone" {
+  description = "AWS availability zone"
+  type = string
+  default = "eu-central-1a"
+}
+
+variable "ami_image" {
+  # eu-central-1/focal-20.04-amd64-hvm-ssd-20210119.1
+  # kernel 5.4.0-1035-aws (~5.4.0-65)
+  description = "AWS AMI image ID"
+  type = string
+  default = "ami-0a875db8a031a9efb"
+}
+
+variable "instance_type" {
+  description = "AWS instance type"
+  type = string
+  default = "c5n.4xlarge"
+}
+
+variable "testbed_name" {
+  description = "Testbed name"
+  type = string
+  default = "testbed1"
+}