From: Peter Mikus Date: Fri, 8 Jul 2022 13:13:44 +0000 (+0000) Subject: fix(terraform): Migrate to DNS entry X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=0483c9009cec85ef93ab3f3e97640e86ae0c9045 fix(terraform): Migrate to DNS entry Signed-off-by: Peter Mikus Change-Id: I6b8c9c59ae635b1f4f77b4e3ddc76f753bb32cc3 --- diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf index 38244af0bd..d0e7490d38 100644 --- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf +++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/providers.tf @@ -5,7 +5,7 @@ provider "aws" { } provider "vault" { - address = "http://10.30.51.28:8200" + address = "http://vault.service.consul:8200" skip_tls_verify = true token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf index 9d6eba6f86..0eb6bcc769 100644 --- a/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf +++ b/fdio.infra.terraform/terraform-aws-1n-aws-c5n/variables.tf @@ -1,5 +1,5 @@ variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio" + default = "dynamic-aws-creds-vault-fdio-csit-jenkins" } variable "region" { diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf index 38244af0bd..d0e7490d38 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/providers.tf @@ -5,7 +5,7 @@ provider "aws" { } provider "vault" { - address = "http://10.30.51.28:8200" + address = "http://vault.service.consul:8200" skip_tls_verify = true token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf index 7a39ad887e..e2ec8aa70c 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c5n/variables.tf @@ -1,5 +1,5 @@ variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio" + default = "dynamic-aws-creds-vault-fdio-csit-jenkins" } variable "region" { diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/providers.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/providers.tf index 38244af0bd..d0e7490d38 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/providers.tf +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/providers.tf @@ -5,7 +5,7 @@ provider "aws" { } provider "vault" { - address = "http://10.30.51.28:8200" + address = "http://vault.service.consul:8200" skip_tls_verify = true token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/variables.tf b/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/variables.tf index 7bddbd5674..5ac9ad8735 100644 --- a/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/variables.tf +++ b/fdio.infra.terraform/terraform-aws-2n-aws-c6gn/variables.tf @@ -1,5 +1,5 @@ variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio" + default = "dynamic-aws-creds-vault-fdio-csit-jenkins" } variable "region" { diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf index 38244af0bd..d0e7490d38 100644 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf +++ b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/providers.tf @@ -5,7 +5,7 @@ provider "aws" { } provider "vault" { - address = "http://10.30.51.28:8200" + address = "http://vault.service.consul:8200" skip_tls_verify = true token = "s.4z5PsufFwV3sHbCzK9Y2Cojd" } \ No newline at end of file diff --git a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf index 177409ad39..3f6a96d66f 100644 --- a/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf +++ b/fdio.infra.terraform/terraform-aws-3n-aws-c5n/variables.tf @@ -1,5 +1,5 @@ variable "vault-name" { - default = "dynamic-aws-creds-vault-fdio" + default = "dynamic-aws-creds-vault-fdio-csit-jenkins" } variable "region" { 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 cf89f28fcb..ec8a47e73f 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://10.30.51.28:8200" + default = "http://vault.service.consul:8200" } variable "vault_provider_skip_tls_verify" { 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 7147227213..a107571bb6 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://10.30.51.28:8200" + default = "http://vault.service.consul:8200" } variable "vault_provider_skip_tls_verify" { diff --git a/fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/variables.tf b/fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/variables.tf index 0e0b3af622..976fbf849e 100644 --- a/fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/variables.tf +++ b/fdio.infra.terraform/terraform-nomad-pyspark-etl/fdio/variables.tf @@ -31,7 +31,7 @@ variable "nomad_provider_key_file" { variable "vault_provider_address" { description = "Vault cluster address." type = string - default = "http://10.30.51.28:8200" + default = "http://vault.service.consul:8200" } variable "vault_provider_skip_tls_verify" {