diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5dfe310 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.terraform* +terraform.tfstate* diff --git a/main.tf b/main.tf index 7d62727..c702464 100644 --- a/main.tf +++ b/main.tf @@ -20,12 +20,11 @@ provider "stackit" { module "project" { source = "./project" + # -- variables for project module organization_id = var.organization_id + sna_net = var.sna_net + } -module "ske" { - source = "./ske" - target_project_id = module.project.project_info["project1"].project_id -} diff --git a/project/00-provider.tf b/project/00-provider.tf deleted file mode 100644 index e69de29..0000000 diff --git a/project/99-variables.tf b/project/99-variables.tf deleted file mode 100644 index e69de29..0000000 diff --git a/project/01-sna.tf b/project/sna.tf similarity index 94% rename from project/01-sna.tf rename to project/sna.tf index 1dcc31f..711c80d 100644 --- a/project/01-sna.tf +++ b/project/sna.tf @@ -11,7 +11,7 @@ resource "stackit_network_area" "sna" { prefix = "10.220.0.0/16" } ] - transfer_network = "172.16.9.0/24" + transfer_network = "var.sna_net" //depends_on = [time_sleep.wait_before_destroy] } diff --git a/project/variables.tf b/project/variables.tf index 91a0d5f..6a8400f 100644 --- a/project/variables.tf +++ b/project/variables.tf @@ -3,3 +3,8 @@ variable "organization_id" { type = string } +variable "sna_net" { + description = "SNA Transfer Network" + type = string +} + diff --git a/ske/00-provider.tf b/ske/00-provider.tf deleted file mode 100644 index e69de29..0000000 diff --git a/ske/99-variables.tf b/ske/99-variables.tf deleted file mode 100644 index e69de29..0000000 diff --git a/ske/main.tf b/ske/main.tf deleted file mode 100644 index 6b0fc17..0000000 --- a/ske/main.tf +++ /dev/null @@ -1,37 +0,0 @@ -# Dieses Netzwerk wird im Projekt erstellt, dessen ID übergeben wurde -resource "stackit_network" "ske_network" { - project_id = var.target_project_id - name = "ske-network" - ipv4_prefix_length = 24 -} - -# Dieser Cluster wird im selben Projekt erstellt -resource "stackit_ske_cluster" "demo-cluster" { - project_id = var.target_project_id # Nutzt die übergebene Variable - name = "demo-cluster" - node_pools = [ - { - name = "np" - machine_type = "g1.4" - minimum = "2" - maximum = "3" - volume_size = "64" - volume_type = "storage_premium_perf4" - availability_zones = ["eu01-3", "eu01-1"] - } - ] - network = { - id = stackit_network.ske_network.id # Korrekte Referenz auf die Ressource oben - } - extensions = { - acl = { - enabled = true - allowed_cidrs = ["0.0.0.0/0"] - } - } -} - -output "ske-egress-ip" { - value = stackit_ske_cluster.demo-cluster.egress_address_ranges -} - diff --git a/ske/provider.tf b/ske/provider.tf deleted file mode 100644 index 05828ca..0000000 --- a/ske/provider.tf +++ /dev/null @@ -1,11 +0,0 @@ -# In project/versions.tf und in ske/versions.tf - -terraform { - required_providers { - stackit = { - source = "stackitcloud/stackit" - version = ">= 0.54.0" # Diese Version passt zu Ihrer Anforderung - } - } -} - diff --git a/ske/variables.tf b/ske/variables.tf deleted file mode 100644 index 1f7b2e5..0000000 --- a/ske/variables.tf +++ /dev/null @@ -1,4 +0,0 @@ -variable "target_project_id" { - description = "Empfängt die ID des Projekts, in dem die SKE-Ressourcen erstellt werden sollen." - type = string -} diff --git a/99-variables.tf b/variables.tf similarity index 87% rename from 99-variables.tf rename to variables.tf index ebb0fec..0321640 100644 --- a/99-variables.tf +++ b/variables.tf @@ -20,3 +20,8 @@ variable "default_region" { default = "eu01" } +variable "sna_net" { + type = string + default = "172.16.9.0/24" + } +