diff options
| -rw-r--r-- | terraform/hash-docker/backend.tf | 6 | ||||
| -rw-r--r-- | terraform/hash-docker/main.tf | 2 | ||||
| -rw-r--r-- | terraform/hash-grafana/backend.tf | 6 | ||||
| -rw-r--r-- | terraform/hash-grafana/grafana.tf | 2 | ||||
| -rw-r--r-- | terraform/hash-grafana/main.tf | 4 | ||||
| -rw-r--r-- | terraform/hash-prometheus/backend.tf | 6 | ||||
| -rw-r--r-- | terraform/hash-prometheus/main.tf | 2 | ||||
| -rw-r--r-- | terraform/terragrunt.hcl | 6 |
8 files changed, 21 insertions, 13 deletions
diff --git a/terraform/hash-docker/backend.tf b/terraform/hash-docker/backend.tf index 24314e3..d793773 100644 --- a/terraform/hash-docker/backend.tf +++ b/terraform/hash-docker/backend.tf @@ -1,12 +1,16 @@ # Generated by Terragrunt. Sig: nIlQXj57tbuaRZEa terraform { + required_version = "~> 1.9.5" + backend "s3" { bucket = "terraform-a6726272-73ff-11ed-8bdd-c79eb8376e05" key = "hash-docker/terraform.tfstate" skip_region_validation = true skip_credentials_validation = true skip_metadata_api_check = true + skip_requesting_account_id = true + skip_s3_checksum = true region = "eu-central-1" - endpoint = "eu-central-1.linodeobjects.com" + endpoints = { s3 : "https://eu-central-1.linodeobjects.com" } } } diff --git a/terraform/hash-docker/main.tf b/terraform/hash-docker/main.tf index 4dde836..ba2c79f 100644 --- a/terraform/hash-docker/main.tf +++ b/terraform/hash-docker/main.tf @@ -1,6 +1,4 @@ terraform { - required_version = "~> 1.3.5" - required_providers { docker = { source = "kreuzwerker/docker" diff --git a/terraform/hash-grafana/backend.tf b/terraform/hash-grafana/backend.tf index c1af67a..b06355d 100644 --- a/terraform/hash-grafana/backend.tf +++ b/terraform/hash-grafana/backend.tf @@ -1,12 +1,16 @@ # Generated by Terragrunt. Sig: nIlQXj57tbuaRZEa terraform { + required_version = "~> 1.9.5" + backend "s3" { bucket = "terraform-a6726272-73ff-11ed-8bdd-c79eb8376e05" key = "hash-grafana/terraform.tfstate" skip_region_validation = true skip_credentials_validation = true skip_metadata_api_check = true + skip_requesting_account_id = true + skip_s3_checksum = true region = "eu-central-1" - endpoint = "eu-central-1.linodeobjects.com" + endpoints = { s3 : "https://eu-central-1.linodeobjects.com" } } } diff --git a/terraform/hash-grafana/grafana.tf b/terraform/hash-grafana/grafana.tf index 19989e2..2c0f719 100644 --- a/terraform/hash-grafana/grafana.tf +++ b/terraform/hash-grafana/grafana.tf @@ -38,7 +38,7 @@ resource "docker_container" "grafana" { env = [ "GF_DATABASE_TYPE=postgres", -# "GF_DATABASE_HOST=[fdf3:aad9:a885:b3a::1]", + # "GF_DATABASE_HOST=[fdf3:aad9:a885:b3a::1]", "GF_DATABASE_HOST=knot.dn42.trygvis.io", "GF_DATABASE_DATABASE=${postgresql_database.grafana.name}", "GF_DATABASE_USER=${postgresql_role.grafana.name}", diff --git a/terraform/hash-grafana/main.tf b/terraform/hash-grafana/main.tf index 00857e5..fb7c03a 100644 --- a/terraform/hash-grafana/main.tf +++ b/terraform/hash-grafana/main.tf @@ -1,6 +1,4 @@ terraform { - required_version = "~> 1.3.5" - required_providers { docker = { source = "kreuzwerker/docker" @@ -22,7 +20,7 @@ terraform { } locals { - host = "hash.trygvis.io" + host = "hash.trygvis.io" } provider "docker" { diff --git a/terraform/hash-prometheus/backend.tf b/terraform/hash-prometheus/backend.tf index ab991d8..d531b8d 100644 --- a/terraform/hash-prometheus/backend.tf +++ b/terraform/hash-prometheus/backend.tf @@ -1,14 +1,16 @@ # Generated by Terragrunt. Sig: nIlQXj57tbuaRZEa terraform { + required_version = "~> 1.9.5" + backend "s3" { bucket = "terraform-a6726272-73ff-11ed-8bdd-c79eb8376e05" key = "hash-prometheus/terraform.tfstate" skip_region_validation = true - skip_requesting_account_id =true skip_credentials_validation = true skip_metadata_api_check = true + skip_requesting_account_id = true skip_s3_checksum = true region = "eu-central-1" - endpoints = { s3: "https://eu-central-1.linodeobjects.com" } + endpoints = { s3 : "https://eu-central-1.linodeobjects.com" } } } diff --git a/terraform/hash-prometheus/main.tf b/terraform/hash-prometheus/main.tf index 79029bc..cbf843e 100644 --- a/terraform/hash-prometheus/main.tf +++ b/terraform/hash-prometheus/main.tf @@ -1,6 +1,4 @@ terraform { - required_version = "~> 1.9.5" - required_providers { docker = { source = "kreuzwerker/docker" diff --git a/terraform/terragrunt.hcl b/terraform/terragrunt.hcl index 382cf17..8af2aca 100644 --- a/terraform/terragrunt.hcl +++ b/terraform/terragrunt.hcl @@ -3,14 +3,18 @@ generate "backend" { if_exists = "overwrite_terragrunt" contents = <<EOF terraform { + required_version = "~> 1.9.5" + backend "s3" { bucket = "terraform-a6726272-73ff-11ed-8bdd-c79eb8376e05" key = "${path_relative_to_include()}/terraform.tfstate" skip_region_validation = true skip_credentials_validation = true skip_metadata_api_check = true + skip_requesting_account_id = true + skip_s3_checksum = true region = "eu-central-1" - endpoint = "eu-central-1.linodeobjects.com" + endpoints = { s3 : "https://eu-central-1.linodeobjects.com" } } } EOF |