From 16d5a6e0c1f6aa7e8013a6f3768a6ece75b63362 Mon Sep 17 00:00:00 2001 From: Sebastian Haderecker Date: Tue, 18 May 2021 16:49:56 +0200 Subject: [PATCH 1/3] Use SAS disk --- cloud/terraform/otc/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/cloud/terraform/otc/main.tf b/cloud/terraform/otc/main.tf index cba45900..2fccd46d 100644 --- a/cloud/terraform/otc/main.tf +++ b/cloud/terraform/otc/main.tf @@ -44,6 +44,7 @@ resource "opentelekomcloud_ecs_instance_v1" "ecs_1" { } system_disk_size = var.ecs_disk_size + system_disk_type = "SAS" security_groups = [opentelekomcloud_networking_secgroup_v2.secgroup_1.id] availability_zone = var.availability_zone key_name = var.key_pair From 0e1a86f93b8dc90e1b7a9d3cbb8dd6e91fb05507 Mon Sep 17 00:00:00 2001 From: Sebastian Haderecker Date: Wed, 19 May 2021 14:28:40 +0200 Subject: [PATCH 2/3] Use b64_url for eip bandwidth name Missed this one in #819 --- cloud/terraform/otc/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloud/terraform/otc/main.tf b/cloud/terraform/otc/main.tf index 2fccd46d..f3508f7a 100644 --- a/cloud/terraform/otc/main.tf +++ b/cloud/terraform/otc/main.tf @@ -56,7 +56,7 @@ resource "opentelekomcloud_vpc_eip_v1" "eip_1" { type = "5_bgp" } bandwidth { - name = "bandwidth-${random_id.tpot.b64_std}" + name = "bandwidth-${random_id.tpot.b64_url}" size = var.eip_size share_type = "PER" } From 7763ceff4cf4443d3f21829bb029dd82a7e701c9 Mon Sep 17 00:00:00 2001 From: Sebastian Haderecker Date: Wed, 19 May 2021 15:57:30 +0200 Subject: [PATCH 3/3] Test connection before git clone Test the connection to github before cloning the repository. Previously it could happen that the git clone failed due to the external network connection not being established immediately after boot. --- cloud/terraform/cloud-init.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/cloud/terraform/cloud-init.yaml b/cloud/terraform/cloud-init.yaml index 18d6621a..cd0277db 100644 --- a/cloud/terraform/cloud-init.yaml +++ b/cloud/terraform/cloud-init.yaml @@ -5,6 +5,7 @@ packages: - git runcmd: + - curl -sS --retry 5 https://github.com - git clone https://github.com/telekom-security/tpotce /root/tpot - /root/tpot/iso/installer/install.sh --type=auto --conf=/root/tpot.conf - rm /root/tpot.conf