Merge pull request #687 from shaderecker/terraform-otc

Update Terraform config for 0.13

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])
 
 <a name="pre"></a>
-## Pre-Requisites
-* [Terraform](https://www.terraform.io/) 0.12
+## Prerequisites
+* [Terraform](https://www.terraform.io/) 0.13
 
 <a name="pre-aws"></a>
 ### Amazon Web Services (AWS)
@@ -90,7 +90,7 @@ In `aws/variables.tf`, you can change the additional variables:
 <a name="variables-otc"></a>
 ### 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
 
 <a name="connecting"></a>
 ## 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).

cloud/terraform/aws/versions.tf

@@ -1,3 +1,8 @@
 terraform {
-  required_version = ">= 0.12"
+  required_version = ">= 0.13"
+  required_providers {
+    aws = {
+      source = "hashicorp/aws"
+    }
+  }
 }

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

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"
 }
@@ -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"
 }
 

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"
+    }
+  }
 }