X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=fdio.infra.terraform%2Fterraform-aws-fdio-csit-dash-env%2Fmain.tf;h=9f115cd6c6dec5c012e2cf7d17e3e994beb09d3f;hb=4ef4d31db9aaa76fd67e1c9a7a05df43dc8b067a;hp=65dc59f999993b1c9205c662b8f1870b823c7991;hpb=d24fe3f719a8c0c084544a794fae1d00fd3aa05c;p=csit.git

diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf
index 65dc59f999..9f115cd6c6 100644
--- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf
+++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf
@@ -11,36 +11,42 @@ module "elastic_beanstalk_application" {
   source = "../terraform-aws-elastic-beanstalk-application"
 
   # application
-  application_description                    = "FD.io CSIT Results Dashboard"
-  application_name                           = "fdio-csit-dash-app"
-  appversion_lifecycle_service_role_arn      = ""
-  appversion_lifecycle_max_count             = 2
+  application_description                    = "FD.io CDASH M7G"
+  application_name                           = "fdio-csit-dash-app-m7g"
+  appversion_lifecycle_service_role_arn      = "arn:aws:iam::407116685360:role/aws-service-role/elasticbeanstalk.amazonaws.com/AWSServiceRoleForElasticBeanstalk"
+  appversion_lifecycle_max_count             = 10
   appversion_lifecycle_delete_source_from_s3 = false
 }
 
 module "elastic_beanstalk_environment" {
   source = "../terraform-aws-elastic-beanstalk-environment"
 
+  # environment
+  application_name = "fdio-csit-dash-app-m7g"
+
   # vpc
-  vpc_cidr_block           = "192.168.0.0/24"
+  vpc_cidr_block           = "10.0.0.0/16"
   vpc_enable_dns_hostnames = true
   vpc_enable_dns_support   = true
   vpc_instance_tenancy     = "default"
 
   # subnet
-  subnet_availability_zone = "eu-central-1a"
+  subnet_a_availability_zone = "eu-north-1a"
+  subnet_a_cidr_block        = "10.0.0.0/20"
+  subnet_b_availability_zone = "eu-north-1b"
+  subnet_b_cidr_block        = "10.0.16.0/20"
 
   # environment
   environment_application            = module.elastic_beanstalk_application.application_name
   environment_description            = module.elastic_beanstalk_application.application_description
-  environment_name                   = "fdio-csit-dash-env"
-  environment_solution_stack_name    = "64bit Amazon Linux 2 v3.3.13 running Python 3.8"
+  environment_name                   = "fdio-csit-dash-env-m7g"
+  environment_solution_stack_name    = "64bit Amazon Linux 2023 v4.0.6 running Python 3.11"
   environment_tier                   = "WebServer"
   environment_wait_for_ready_timeout = "25m"
   environment_version_label          = ""
 
   # aws:ec2:instances
-  instances_instance_types = "t3a.medium"
+  instances_instance_types = "m7g.2xlarge"
 
   # aws:ec2:vpc
   associate_public_ip_address = true
@@ -50,7 +56,8 @@ module "elastic_beanstalk_environment" {
   default_listener_enabled = true
 
   # aws:elasticbeanstalk:environment
-  environment_loadbalancer_type = "network"
+  environment_loadbalancer_type               = "application"
+  environment_loadbalancer_ssl_certificate_id = "arn:aws:acm:eu-north-1:407116685360:certificate/3ef3c6ae-f1d4-49f0-a8cd-5d090991bf73"
 
   # aws:elasticbeanstalk:environment:process:default
   environment_process_default_healthcheck_interval      = 10