From: pmikus Date: Wed, 31 Jan 2024 10:44:17 +0000 (+0000) Subject: feat(terraform): 2n-c7gn X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=06a339415a7e4a589fba3219c96fc9d72fd48631 feat(terraform): 2n-c7gn Signed-off-by: Peter Mikus Change-Id: I7a1f9744c4ca8abbd4814ab6cccba388ef466f50 --- diff --git a/fdio.infra.ansible/roles/aws/tasks/main.yaml b/fdio.infra.ansible/roles/aws/tasks/main.yaml index 35ea985e1f..b5132c1909 100644 --- a/fdio.infra.ansible/roles/aws/tasks/main.yaml +++ b/fdio.infra.ansible/roles/aws/tasks/main.yaml @@ -33,8 +33,6 @@ with_items: - "igb_uio" - "vfio-pci" - notify: - - "Reboot Server" tags: - aws-load-kernel-modules @@ -46,8 +44,6 @@ create: "yes" with_items: - "options igb_uio wc_activate=1" - notify: - - "Reboot Server" tags: - aws-load-kernel-modules @@ -59,13 +55,9 @@ create: "yes" with_items: - "options vfio enable_unsafe_noiommu_mode=1" - notify: - - "Reboot Server" tags: - aws-load-kernel-modules -- meta: flush_handlers - #- name: Get vfio-pci With WC Patcher # ansible.builtin.get_url: # url: "https://github.com/amzn/amzn-drivers/raw/master/userspace/dpdk/enav2-vfio-patch/get-vfio-with-wc.sh" diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/main.tf b/fdio.infra.terraform/terraform-aws-2n-c7gn/main.tf index 5711d7389e..5d9899773b 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c7gn/main.tf +++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/main.tf @@ -5,7 +5,7 @@ data "vault_aws_access_credentials" "creds" { locals { ansible_python_executable = "/usr/bin/python3" - availability_zone = "eu-central-1b" + availability_zone = "${var.region}a" name = "csit-vpc" environment = "csit-vpc-environment" key_pair_key_name = "${var.resource_prefix}-${var.testbed_name}-pk" diff --git a/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf b/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf index 194a71d229..2a80b86936 100644 --- a/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf +++ b/fdio.infra.terraform/terraform-aws-2n-c7gn/variables.tf @@ -5,7 +5,7 @@ variable "vault-name" { variable "region" { description = "AWS Region." type = string - default = "eu-central-1" + default = "eu-west-1" } variable "resource_prefix" { @@ -24,19 +24,7 @@ variable "testbed_name" { variable "private_key_algorithm" { description = "The name of the algorithm to use for the key." type = string - default = "RSA" -} - -variable "private_key_ecdsa_curve" { - description = "When algorithm is ECDSA, the name of the elliptic curve to use." - type = string - default = "P521" -} - -variable "private_key_rsa_bits" { - description = "When algorithm is RSA, the size of the generated RSA key in bits." - type = number - default = 4096 + default = "ED25519" } # Variables for Placement Group @@ -50,7 +38,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-07430bfa17fd4e597" + default = "ami-0b5aa26a6e4192705" } variable "tg_associate_public_ip_address" { @@ -86,7 +74,7 @@ variable "tg_source_dest_check" { variable "sut1_ami" { description = "AMI to use for the instance." type = string - default = "ami-0cebabdc14ee56909" + default = "ami-08930f71bd0be1085" } variable "sut1_associate_public_ip_address" { diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/main.tf b/fdio.infra.terraform/terraform-aws-3n-c7gn/main.tf index fe443bc96c..68d2dd9be2 100644 --- a/fdio.infra.terraform/terraform-aws-3n-c7gn/main.tf +++ b/fdio.infra.terraform/terraform-aws-3n-c7gn/main.tf @@ -5,7 +5,7 @@ data "vault_aws_access_credentials" "creds" { locals { ansible_python_executable = "/usr/bin/python3" - availability_zone = "eu-central-1a" + availability_zone = "${var.region}a" name = "csit-vpc" environment = "csit-vpc-environment" key_pair_key_name = "${var.resource_prefix}-${var.testbed_name}-pk" diff --git a/fdio.infra.terraform/terraform-aws-3n-c7gn/variables.tf b/fdio.infra.terraform/terraform-aws-3n-c7gn/variables.tf index f14d8bd2fc..3ad51afeba 100644 --- a/fdio.infra.terraform/terraform-aws-3n-c7gn/variables.tf +++ b/fdio.infra.terraform/terraform-aws-3n-c7gn/variables.tf @@ -5,7 +5,7 @@ variable "vault-name" { variable "region" { description = "AWS Region." type = string - default = "eu-central-1" + default = "eu-west-1" } variable "resource_prefix" { @@ -38,7 +38,7 @@ variable "placement_group_strategy" { variable "tg_ami" { description = "AMI to use for the instance." type = string - default = "ami-07430bfa17fd4e597" + default = "ami-0b5aa26a6e4192705" } variable "tg_associate_public_ip_address" { @@ -74,7 +74,7 @@ variable "tg_source_dest_check" { variable "sut1_ami" { description = "AMI to use for the instance." type = string - default = "ami-0cebabdc14ee56909" + default = "ami-08930f71bd0be1085" } variable "sut1_associate_public_ip_address" { @@ -110,7 +110,7 @@ variable "sut1_source_dest_check" { variable "sut2_ami" { description = "AMI to use for the instance." type = string - default = "ami-0cebabdc14ee56909" + default = "ami-08930f71bd0be1085" } variable "sut2_associate_public_ip_address" { diff --git a/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl b/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl index 135d1c353e..f97bd5d01b 100644 --- a/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl +++ b/fdio.infra/packer-aws-sut/ubuntu_jammy_arm.pkr.hcl @@ -51,16 +51,16 @@ source "amazon-ebs" "csit_ubuntu_jammy_arm_sut" { ami_name = "csit_ubuntu_jammy_arm_sut" ami_description = "CSIT SUT image based on Ubuntu jammy" ena_support = true - instance_type = "c6gn.4xlarge" + instance_type = "c7gn.4xlarge" launch_block_device_mappings { device_name = "/dev/sda1" volume_size = 40 volume_type = "gp2" } force_deregister = true - region = "eu-central-1" + region = "eu-west-1" skip_create_ami = false - source_ami = "ami-0329d3839379bfd15" + source_ami = "ami-0a1b36900d715a3ad" ssh_username = "ubuntu" }