From 72e4134c86b39b69158dfad574bf3835297642fa Mon Sep 17 00:00:00 2001 From: Sebastian Haderecker Date: Wed, 26 Aug 2020 10:59:39 +0200 Subject: [PATCH 1/5] OTC: Update required_providers for Terraform 0.13 --- cloud/terraform/otc/versions.tf | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/cloud/terraform/otc/versions.tf b/cloud/terraform/otc/versions.tf index d9b6f790..30ad80c6 100644 --- a/cloud/terraform/otc/versions.tf +++ b/cloud/terraform/otc/versions.tf @@ -1,3 +1,11 @@ terraform { - required_version = ">= 0.12" + required_version = ">= 0.13" + required_providers { + opentelekomcloud = { + source = "terraform-providers/opentelekomcloud" + } + random = { + source = "hashicorp/random" + } + } } From d8f14d9c9f35f0d80225467945835dc387e52276 Mon Sep 17 00:00:00 2001 From: Sebastian Haderecker Date: Wed, 26 Aug 2020 11:04:34 +0200 Subject: [PATCH 2/5] AWS: Update required_providers for Terraform 0.13 --- cloud/terraform/aws/versions.tf | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cloud/terraform/aws/versions.tf b/cloud/terraform/aws/versions.tf index d9b6f790..55dad255 100644 --- a/cloud/terraform/aws/versions.tf +++ b/cloud/terraform/aws/versions.tf @@ -1,3 +1,8 @@ terraform { - required_version = ">= 0.12" + required_version = ">= 0.13" + required_providers { + aws = { + source = "hashicorp/aws" + } + } } From 840662da48e81a5940240e16c3fec7d48a3846f5 Mon Sep 17 00:00:00 2001 From: Sebastian Haderecker Date: Wed, 26 Aug 2020 11:21:55 +0200 Subject: [PATCH 3/5] Update OTC Debian 10 base image id --- cloud/terraform/otc/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud/terraform/otc/variables.tf b/cloud/terraform/otc/variables.tf index 24eca503..a515451a 100644 --- a/cloud/terraform/otc/variables.tf +++ b/cloud/terraform/otc/variables.tf @@ -50,7 +50,7 @@ variable "key_pair" { } variable "image_id" { - default = "d97dd29c-9318-4e4c-8d3a-7307d1513b77" + default = "fb7b0c9c-8b20-4e3f-832c-ea38c981c282" description = "Select a Debian 10 base image id" } From c33229b53a67c165e1b0599db81f44d71cae6cbc Mon Sep 17 00:00:00 2001 From: Sebastian Haderecker Date: Wed, 26 Aug 2020 11:45:17 +0200 Subject: [PATCH 4/5] Fix variable typo --- cloud/terraform/otc/main.tf | 2 +- cloud/terraform/otc/variables.tf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cloud/terraform/otc/main.tf b/cloud/terraform/otc/main.tf index 36030911..ceefd27e 100644 --- a/cloud/terraform/otc/main.tf +++ b/cloud/terraform/otc/main.tf @@ -36,7 +36,7 @@ resource "random_id" "tpot" { } resource "opentelekomcloud_compute_instance_v2" "ecs_1" { - availability_zone = var.availabiliy_zone + availability_zone = var.availability_zone name = random_id.tpot.b64 flavor_name = var.flavor key_pair = var.key_pair diff --git a/cloud/terraform/otc/variables.tf b/cloud/terraform/otc/variables.tf index a515451a..e4a3a500 100644 --- a/cloud/terraform/otc/variables.tf +++ b/cloud/terraform/otc/variables.tf @@ -34,7 +34,7 @@ variable "ecs_prefix" { } # ECS configuration -variable "availabiliy_zone" { +variable "availability_zone" { default = "eu-de-03" description = "Select an availability zone" } From 42852a85ea686b750e967c52aa49d518755c9170 Mon Sep 17 00:00:00 2001 From: Sebastian Haderecker Date: Wed, 26 Aug 2020 11:46:16 +0200 Subject: [PATCH 5/5] Update README.md --- cloud/terraform/README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cloud/terraform/README.md b/cloud/terraform/README.md index 9ee86cea..c330aa63 100644 --- a/cloud/terraform/README.md +++ b/cloud/terraform/README.md @@ -9,7 +9,7 @@ This can easily be extended to support other [Terraform providers](https://www.t - [What get's created](#what-created) - [Amazon Web Services (AWS)](#what-created-aws) - [Open Telekom Cloud (OTC)](#what-created-otc) -- [Pre-Requisites](#pre) +- [Prerequisites](#pre) - [Amazon Web Services (AWS)](#pre-aws) - [Open Telekom Cloud (OTC)](#pre-otc) - [Terraform Variables](#variables) @@ -45,8 +45,8 @@ This can easily be extended to support other [Terraform providers](https://www.t * Network, Subnet, Router (= Virtual Private Cloud [VPC]) -## Pre-Requisites -* [Terraform](https://www.terraform.io/) 0.12 +## Prerequisites +* [Terraform](https://www.terraform.io/) 0.13 ### Amazon Web Services (AWS) @@ -90,7 +90,7 @@ In `aws/variables.tf`, you can change the additional variables: ### Open Telekom Cloud (OTC) In `otc/variables.tf`, you can change the additional variables: -* `availabiliy_zone` +* `availability_zone` * `flavor` * `key_pair` - Specify an existing SSH key pair * `image_id` @@ -124,4 +124,4 @@ If you want the remove the built infrastructure, you can run [`terraform destroy ## Connecting to the Instance -When the installation is completed, you can proceed with connecting/logging in to the T-Pot according to the [documentation](https://github.com/dtag-dev-sec/tpotce#ssh-and-web-access). +When the installation is completed, you can proceed with connecting/logging in to the T-Pot according to the [documentation](https://github.com/telekom-security/tpotce#ssh-and-web-access).