Merge pull request #763 from shaderecker/terraform-otc

Terraform updates
This commit is contained in:
Marco Ochse
2021-02-05 11:54:31 +01:00
committed by GitHub
7 changed files with 88 additions and 26 deletions

20
cloud/terraform/aws/.terraform.lock.hcl generated Normal file
View File

@ -0,0 +1,20 @@
# This file is maintained automatically by "terraform init".
# Manual edits may be lost in future updates.
provider "registry.terraform.io/hashicorp/aws" {
version = "3.26.0"
constraints = "3.26.0"
hashes = [
"h1:0i78FItlPeiomd+4ThZrtm56P5K33k7/6dnEe4ZePI0=",
"zh:26043eed36d070ca032cf04bc980c654a25821a8abc0c85e1e570e3935bbfcbb",
"zh:2fe68f3f78d23830a04d7fac3eda550eef1f627dfc130486f70a65dc5c254300",
"zh:3d66484c608c64678e639db25d63872783ce60363a1246e30317f21c9c23b84b",
"zh:46ffd755cfd4cf94fe66342797b5afdcef010a24e126c67fee141b357d393535",
"zh:5e96f24357e945c9067cf5e032ad1d003609629c956c2f9f642fefe714e74587",
"zh:60c27aca36bb63bf3e865c2193be80ca83b376581d00f9c220af4b013e163c4d",
"zh:896f0f22d19d41e71b22f9240b261714c3915b165ddefeb771e7734d69dc47ea",
"zh:90de9966cb2fd3e2f326df291595e55d2dd2d90e7d6dd085c2c8691dce82bdb4",
"zh:ad05a91a88ceb1d6de5a568f7cc0b0e5bc0a79f3da70bc28c1e7f3750e362d58",
"zh:e8c63f59c6465329e1f3357498face3dd7ef10a033df3c366a33aa9e94b46c01",
]
}

View File

@ -32,26 +32,26 @@ variable "ec2_instance_type" {
variable "ec2_ami" {
type = map(string)
default = {
"af-south-1" = "ami-0cd567568c63c1c50"
"ap-east-1" = "ami-da6c2eab"
"ap-northeast-1" = "ami-0143c7691e0f7cd73"
"ap-northeast-2" = "ami-08e248bc8d4c0c2c7"
"ap-south-1" = "ami-00c3a0e8f345e299e"
"ap-southeast-1" = "ami-0782777da8d7d10c4"
"ap-southeast-2" = "ami-01b0588564524ce82"
"ca-central-1" = "ami-0de46d86862b936a0"
"eu-central-1" = "ami-01580e1a2caffeb61"
"eu-north-1" = "ami-00466bdeb1cc0a297"
"eu-south-1" = "ami-0e5461d66f95255c9"
"eu-west-1" = "ami-0ec224441e69e034e"
"eu-west-2" = "ami-0e02b7cae376541f2"
"eu-west-3" = "ami-09de525c1f6538ef8"
"me-south-1" = "ami-02465bc955e5fa1d1"
"sa-east-1" = "ami-08605b43346ed52e8"
"us-east-1" = "ami-0fda9f4b1eaa92881"
"us-east-2" = "ami-08f6e7446faea65e0"
"us-west-1" = "ami-091f15e9ff781f127"
"us-west-2" = "ami-06d8a32aedc6986f5"
"af-south-1" = "ami-04090a79eb0bcb6c1"
"ap-east-1" = "ami-0327f60df432e2479"
"ap-northeast-1" = "ami-06bc324209030cbc8"
"ap-northeast-2" = "ami-02ee842962ae7df95"
"ap-south-1" = "ami-0d548fffbb2d54e42"
"ap-southeast-1" = "ami-0dcf891cda6248f00"
"ap-southeast-2" = "ami-022578f782d4e5d30"
"ca-central-1" = "ami-01444dd84a75e9a82"
"eu-central-1" = "ami-097411fa8fbfdffda"
"eu-north-1" = "ami-026984326b6456f6a"
"eu-south-1" = "ami-07ad114e5df69197e"
"eu-west-1" = "ami-0101794b418f8b2a6"
"eu-west-2" = "ami-00eac9341e72e638a"
"eu-west-3" = "ami-01469c569416f3bd3"
"me-south-1" = "ami-0821f357b877b076d"
"sa-east-1" = "ami-0c87b2c6219e3d5fd"
"us-east-1" = "ami-047f0b13f023f6553"
"us-east-2" = "ami-0988470f4e830799f"
"us-west-1" = "ami-0be6bacfeb2913ac2"
"us-west-2" = "ami-0112d55fbe29acc68"
}
}
@ -68,7 +68,7 @@ variable "linux_password" {
# These will go in the generated tpot.conf file
variable "tpot_flavor" {
default = "STANDARD"
description = "Specify your tpot flavor [STANDARD, SENSOR, INDUSTRIAL, COLLECTOR, NEXTGEN]"
description = "Specify your tpot flavor [STANDARD, SENSOR, INDUSTRIAL, COLLECTOR, NEXTGEN, MEDICAL]"
}
variable "web_user" {

View File

@ -3,6 +3,7 @@ terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = "3.26.0"
}
}
}

39
cloud/terraform/otc/.terraform.lock.hcl generated Normal file
View File

@ -0,0 +1,39 @@
# This file is maintained automatically by "terraform init".
# Manual edits may be lost in future updates.
provider "registry.terraform.io/hashicorp/random" {
version = "3.0.1"
constraints = "~> 3.0.1"
hashes = [
"h1:SzM8nt2wzLMI28A3CWAtW25g3ZCm1O4xD0h3Ps/rU1U=",
"zh:0d4f683868324af056a9eb2b06306feef7c202c88dbbe6a4ad7517146a22fb50",
"zh:4824b3c7914b77d41dfe90f6f333c7ac9860afb83e2a344d91fbe46e5dfbec26",
"zh:4b82e43712f3cf0d0cbc95b2cbcd409ba8f0dc7848fdfb7c13633c27468ed04a",
"zh:78b3a2b860c3ebc973a794000015f5946eb59b82705d701d487475406b2612f1",
"zh:88bc65197bd74ff408d147b32f0045372ae3a3f2a2fdd7f734f315d988c0e4a2",
"zh:91bd3c9f625f177f3a5d641a64e54d4b4540cb071070ecda060a8261fb6eb2ef",
"zh:a6818842b28d800f784e0c93284ff602b0c4022f407e4750da03f50b853a9a2c",
"zh:c4a1a2b52abd05687e6cfded4a789dcd7b43e7a746e4d02dd1055370cf9a994d",
"zh:cf65041bf12fc3bde709c1d267dbe94142bc05adcabc4feb17da3b12249132ac",
"zh:e385e00e7425dda9d30b74ab4ffa4636f4b8eb23918c0b763f0ffab84ece0c5c",
]
}
provider "registry.terraform.io/opentelekomcloud/opentelekomcloud" {
version = "1.22.5"
constraints = "1.22.5"
hashes = [
"h1:H20WxSx+j2JyrqHAgqsrV3rMWEOEZVEQuA7upz/1IgY=",
"zh:276ab06e7c011351fc5a803fea0321a9d12b1353bd43f5389f3bbf491e31fc41",
"zh:3191dc598ea4e4c99d08a2b1a5f65710dbcc1a892b1f9dde7b52515f32028319",
"zh:43db37c5fb6a886ce3bbc2aa730854476da7dd0340622ad874998041fa96f7a2",
"zh:45f3e2677a4c35bd88d435c906224092e0dde17055a203b474da2eeacffbf9b7",
"zh:504568581e561130fc0a9ceb6514e9664c67e3a89cd6c912f64c82f0a0305a30",
"zh:5646c76cbe710fd0acde409cdcfb352dd53a282c0207e46e33ac5714d0eaa0b9",
"zh:578b0f5d43f156f86ca6a63604da6e968f035d0b4bf6ccfc83db284fd31057f6",
"zh:784459b8350dc650f01e6866bcec0632e8b5a8733d81e6ed53bc8cc1254abb92",
"zh:970aa873a81994cddf84279b255d3f51a4138b23cb9162707cefb84042451bfc",
"zh:e892b8b6225a46067586b8e54a7102ac1b0fc296b4851dab3d4cc185de538d66",
"zh:f8c4699eebe99ac93d9cdccfcc809a5bd3d6c238be136d5a26c4e812ef30ec32",
]
}

View File

@ -37,7 +37,7 @@ resource "random_id" "tpot" {
resource "opentelekomcloud_compute_instance_v2" "ecs_1" {
availability_zone = var.availability_zone
name = random_id.tpot.b64
name = random_id.tpot.b64_std
flavor_name = var.flavor
key_pair = var.key_pair
security_groups = [opentelekomcloud_networking_secgroup_v2.secgroup_1.name]

View File

@ -40,7 +40,7 @@ variable "availability_zone" {
}
variable "flavor" {
default = "s2.medium.8"
default = "s3.medium.8"
description = "Select a compute flavor"
}
@ -50,7 +50,7 @@ variable "key_pair" {
}
variable "image_id" {
default = "fb7b0c9c-8b20-4e3f-832c-ea38c981c282"
default = "cf471250-a755-4df8-8c42-6faa5a224ea0"
description = "Select a Debian 10 base image id"
}
@ -62,7 +62,7 @@ variable "volume_size" {
# These will go in the generated tpot.conf file
variable "tpot_flavor" {
default = "STANDARD"
description = "Specify your tpot flavor [STANDARD, SENSOR, INDUSTRIAL, COLLECTOR, NEXTGEN]"
description = "Specify your tpot flavor [STANDARD, SENSOR, INDUSTRIAL, COLLECTOR, NEXTGEN, MEDICAL]"
}
variable "web_user" {

View File

@ -2,10 +2,12 @@ terraform {
required_version = ">= 0.13"
required_providers {
opentelekomcloud = {
source = "terraform-providers/opentelekomcloud"
source = "opentelekomcloud/opentelekomcloud"
version = "1.22.5"
}
random = {
source = "hashicorp/random"
version = "~> 3.0.1"
}
}
}