From 23806a9fd15f111506dcb1a7323103dcb3b1de39 Mon Sep 17 00:00:00 2001 From: pmikus Date: Fri, 28 Oct 2022 13:30:46 +0000 Subject: [PATCH] feat(cdash): Update terraform Signed-off-by: pmikus Change-Id: I6a3c348cd4c021a9a8df1ff76270d0a95fc80f63 --- fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/main.tf | 4 ++-- .../terraform-aws-fdio-csit-dash-app-base/variables.tf | 4 ++-- .../terraform-aws-fdio-csit-dash-app-base/versions.tf | 2 +- fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/main.tf | 2 +- fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/main.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/main.tf index 7ecca06394..7cc6185df9 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/main.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/main.tf @@ -1,6 +1,6 @@ locals { name = "fdio-csit-dash-app" - version = "fdio-csit-dash-app-${var.version}" + version = "fdio-csit-dash-app-base-${var.version}" } data "vault_aws_access_credentials" "creds" { @@ -10,7 +10,7 @@ data "vault_aws_access_credentials" "creds" { module "elastic_beanstalk_application_version" { source = "../terraform-aws-elastic-beanstalk-application-version" - application_description = "FD.io CSIT Results Dashboard" + application_description = "FD.io CDASH" application_name = local.name application_version_name = local.version } diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf index ec8a47e73f..d3f0eabbd2 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/variables.tf @@ -7,7 +7,7 @@ variable "region" { variable "vault_provider_address" { description = "Vault cluster address." type = string - default = "http://vault.service.consul:8200" + default = "http://10.30.51.24:8200" } variable "vault_provider_skip_tls_verify" { @@ -30,5 +30,5 @@ variable "vault_name" { variable "version" { description = "Application version string." type = number - default = 1 + default = 39 } diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf index 4b05b16b27..d3a7e8ea9e 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-app-base/versions.tf @@ -1,6 +1,6 @@ terraform { backend "consul" { - address = "10.32.8.14:8500" + address = "10.30.51.24:8500" scheme = "http" path = "terraform/app-base" } 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..9b26affeb2 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 @@ -34,7 +34,7 @@ module "elastic_beanstalk_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_solution_stack_name = "64bit Amazon Linux 2 v3.4.0 running Python 3.8" environment_tier = "WebServer" environment_wait_for_ready_timeout = "25m" environment_version_label = "" diff --git a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf index a107571bb6..a18b043d00 100644 --- a/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf +++ b/fdio.infra.terraform/terraform-aws-fdio-csit-dash-env/variables.tf @@ -7,7 +7,7 @@ variable "region" { variable "vault_provider_address" { description = "Vault cluster address." type = string - default = "http://vault.service.consul:8200" + default = "http://10.30.51.24:8200" } variable "vault_provider_skip_tls_verify" { -- 2.16.6