From e2f9a7cfddf54ae7a66baaa7b2df312dd00f664c Mon Sep 17 00:00:00 2001 From: Daniel Gross Date: Mon, 25 Aug 2025 17:03:02 +0200 Subject: [PATCH] Update project names --- 01-network.tf | 42 +++++++++++++++++------------------ 02-pfSense-image.tf | 4 ++-- 03-pfSense-appliance.tf | 10 ++++----- 04-attachment.tf | 2 +- 05-server.tf | 14 ++++++------ 06-security-group.tf | 16 ++++++------- 07-object-storage.tf | 6 ++--- 08-ske.tf | 4 ++-- modules/project/02-project.tf | 12 +++++----- 9 files changed, 55 insertions(+), 55 deletions(-) diff --git a/01-network.tf b/01-network.tf index c344f5c..93f2b6a 100644 --- a/01-network.tf +++ b/01-network.tf @@ -1,22 +1,22 @@ /* ------- project 1 - landingzone ------------ */ resource "stackit_network" "wan_network" { - project_id = module.project.project_info["project1"].project_id - name = "wan_network" + project_id = module.project.project_info["landingzone"].project_id + name = "landingzone_wan" ipv4_nameservers = ["1.1.1.1", "8.8.8.8"] ipv4_prefix = "10.220.0.0/24" routed = true } resource "stackit_network" "lan_network1" { - project_id = module.project.project_info["project1"].project_id + project_id = module.project.project_info["landingzone"].project_id name = "lan_network1" ipv4_prefix = "10.220.1.0/24" routed = true } resource "stackit_network_interface" "wan" { - project_id = module.project.project_info["project1"].project_id - network_id = stackit_network.wan_network.network_id + project_id = module.project.project_info["landingzone"].project_id + network_id = stackit_network.landingzone_wan.network_id security = false name = "MGMT" ipv4 = "10.220.0.254" @@ -24,7 +24,7 @@ resource "stackit_network_interface" "wan" { } resource "stackit_network_interface" "lan1" { - project_id = module.project.project_info["project1"].project_id + project_id = module.project.project_info["landingzone"].project_id network_id = stackit_network.lan_network1.network_id security = false name = "LAN1" @@ -32,14 +32,14 @@ resource "stackit_network_interface" "lan1" { /* ---------- project 2 core ------------------ */ resource "stackit_network" "p2_lan_network1" { - project_id = module.project.project_info["project2"].project_id + project_id = module.project.project_info["core"].project_id name = "p2_lan_network" ipv4_prefix = "10.220.5.0/24" routed = true } resource "stackit_network_interface" "p2_lan1" { - project_id = module.project.project_info["project2"].project_id + project_id = module.project.project_info["core"].project_id network_id = stackit_network.p2_lan_network1.network_id security = false name = "P2LAN1" @@ -48,14 +48,14 @@ resource "stackit_network_interface" "p2_lan1" { /* this is for adding a second network interface to the core project (for WAN access).*/ resource "stackit_network" "p2_wan_network1" { - project_id = module.project.project_info["project2"].project_id + project_id = module.project.project_info["core"].project_id name = "wan" ipv4_prefix = "10.220.50.0/24" routed = true } resource "stackit_network_interface" "p2_wan_interface1" { - project_id = module.project.project_info["project2"].project_id + project_id = module.project.project_info["core"].project_id network_id = stackit_network.p2_wan_network1.network_id security = false name = "wan_if" @@ -64,14 +64,14 @@ resource "stackit_network_interface" "p2_wan_interface1" { /* ---------- project 3 backup ------------------ */ resource "stackit_network" "p3_lan_network1" { - project_id = module.project.project_info["project3"].project_id + project_id = module.project.project_info["backup"].project_id name = "p3_lan_network" ipv4_prefix = "10.220.6.0/24" routed = true } resource "stackit_network_interface" "p3_lan1" { - project_id = module.project.project_info["project3"].project_id + project_id = module.project.project_info["backup"].project_id network_id = stackit_network.p3_lan_network1.network_id security = false name = "P3LAN1" @@ -82,7 +82,7 @@ resource "stackit_network_interface" "p3_lan1" { /* ------- project 5 - vpn ------------ */ resource "stackit_network" "wan_network_beta" { - project_id = module.project.project_info["project5"].project_id + project_id = module.project.project_info["vpn"].project_id name = "wan_network_beta" ipv4_nameservers = ["1.1.1.1", "8.8.8.8"] ipv4_prefix = "10.230.0.0/24" @@ -90,14 +90,14 @@ resource "stackit_network" "wan_network_beta" { } resource "stackit_network" "lan_network_beta" { - project_id = module.project.project_info["project5"].project_id + project_id = module.project.project_info["vpn"].project_id name = "lan_network_beta" ipv4_prefix = "10.230.1.0/24" routed = true } resource "stackit_network_interface" "wan_beta" { - project_id = module.project.project_info["project5"].project_id + project_id = module.project.project_info["vpn"].project_id network_id = stackit_network.wan_network_beta.network_id security = false name = "MGMT" @@ -106,7 +106,7 @@ resource "stackit_network_interface" "wan_beta" { } resource "stackit_network_interface" "lan_beta" { - project_id = module.project.project_info["project5"].project_id + project_id = module.project.project_info["vpn"].project_id network_id = stackit_network.lan_network_beta.network_id security = false name = "LAN1" @@ -114,14 +114,14 @@ resource "stackit_network_interface" "lan_beta" { /* ---------- project 6 infra ------------------ */ resource "stackit_network" "p6_lan_network1" { - project_id = module.project.project_info["project6"].project_id + project_id = module.project.project_info["infra"].project_id name = "p6_lan_network" ipv4_prefix = "10.230.5.0/24" routed = true } resource "stackit_network_interface" "p6_lan1" { - project_id = module.project.project_info["project6"].project_id + project_id = module.project.project_info["infra"].project_id network_id = stackit_network.p6_lan_network1.network_id security = false name = "P6LAN1" @@ -130,17 +130,17 @@ resource "stackit_network_interface" "p6_lan1" { /* ---------- public IP configuration------------- */ resource "stackit_public_ip" "wan_ip" { - project_id = module.project.project_info["project1"].project_id + project_id = module.project.project_info["landingzone"].project_id network_interface_id = stackit_network_interface.wan.network_interface_id } resource "stackit_public_ip" "wan_ip_beta" { - project_id = module.project.project_info["project5"].project_id + project_id = module.project.project_info["vpn"].project_id network_interface_id = stackit_network_interface.wan_beta.network_interface_id } /* this is for adding a public IP to the second project (core) for WAN access. */ resource "stackit_public_ip" "wan_server" { - project_id = module.project.project_info["project2"].project_id + project_id = module.project.project_info["core"].project_id network_interface_id = stackit_network_interface.p2_wan_interface1.network_interface_id } diff --git a/02-pfSense-image.tf b/02-pfSense-image.tf index 39b06b9..2e30973 100644 --- a/02-pfSense-image.tf +++ b/02-pfSense-image.tf @@ -13,7 +13,7 @@ resource "null_resource" "pfsense_image_file" { // Upload VPN Appliance Image to STACKIT resource "stackit_image" "pfsense_image" { - project_id = module.project.project_info["project1"].project_id + project_id = module.project.project_info["landingzone"].project_id name = "pfsense-2.7.2-amd64-image" local_file_path = "./pfsense.qcow2" disk_format = "qcow2" @@ -34,7 +34,7 @@ resource "stackit_image" "pfsense_image" { // Upload VPN Appliance Image to STACKIT resource "stackit_image" "pfsense_image_beta" { - project_id = module.project.project_info["project5"].project_id + project_id = module.project.project_info["vpn"].project_id name = "pfsense-2.7.2-amd64-image" local_file_path = "./pfsense.qcow2" disk_format = "qcow2" diff --git a/03-pfSense-appliance.tf b/03-pfSense-appliance.tf index 7f6676c..633201e 100644 --- a/03-pfSense-appliance.tf +++ b/03-pfSense-appliance.tf @@ -1,6 +1,6 @@ // This file is part of the STACKIT Terraform module for deploying a pfSense appliance. resource "stackit_volume" "pfsense_vol" { - project_id = module.project.project_info["project1"].project_id + project_id = module.project.project_info["landingzone"].project_id name = "pfsense-2.7.2-root" availability_zone = var.region_az1 size = 50 @@ -12,7 +12,7 @@ resource "stackit_volume" "pfsense_vol" { } resource "stackit_server" "pfsense_appliance" { - project_id = module.project.project_info["project1"].project_id + project_id = module.project.project_info["landingzone"].project_id name = "pfSense-alpha" boot_volume = { source_type = "volume" @@ -21,12 +21,12 @@ resource "stackit_server" "pfsense_appliance" { availability_zone = var.region_az1 machine_type = var.flavor network_interfaces = [stackit_network_interface.wan.network_interface_id] - depends_on = [ stackit_network.wan_network ] + depends_on = [ stackit_network.landingzone_wan ] } // This file is part of the STACKIT Terraform module for deploying a pfSense appliance. resource "stackit_volume" "pfsense_vol_beta" { - project_id = module.project.project_info["project5"].project_id + project_id = module.project.project_info["vpn"].project_id name = "pfsense-2.7.2-root" availability_zone = var.region_az1 size = 50 @@ -38,7 +38,7 @@ resource "stackit_volume" "pfsense_vol_beta" { } resource "stackit_server" "pfsense_appliance_beta" { - project_id = module.project.project_info["project5"].project_id + project_id = module.project.project_info["vpn"].project_id name = "pfSense-beta" boot_volume = { source_type = "volume" diff --git a/04-attachment.tf b/04-attachment.tf index b9c3abb..6a0a1b9 100644 --- a/04-attachment.tf +++ b/04-attachment.tf @@ -1,7 +1,7 @@ // Attach network interfaces to the pfSense server without recreating the server resource "stackit_server_network_interface_attach" "nic-attachment-lan1" { - project_id = module.project.project_info["project1"].project_id + project_id = module.project.project_info["landingzone"].project_id server_id = stackit_server.pfsense_appliance.server_id network_interface_id = stackit_network_interface.lan1.network_interface_id depends_on = [ stackit_server.pfsense_appliance ] diff --git a/05-server.tf b/05-server.tf index e369525..19bce5e 100644 --- a/05-server.tf +++ b/05-server.tf @@ -1,6 +1,6 @@ // create the server in the second project (core) resource "stackit_volume" "example_vol" { - project_id = module.project.project_info["project2"].project_id + project_id = module.project.project_info["core"].project_id name = "example_root" availability_zone = var.region_az1 size = 200 @@ -12,7 +12,7 @@ resource "stackit_volume" "example_vol" { } resource "stackit_server" "dev_server" { - project_id = module.project.project_info["project2"].project_id + project_id = module.project.project_info["core"].project_id name = "linux-alpha" boot_volume = { source_type = "volume" @@ -26,13 +26,13 @@ resource "stackit_server" "dev_server" { } data "stackit_image" "debian" { - project_id = module.project.project_info["project2"].project_id + project_id = module.project.project_info["core"].project_id image_id = "d1151962-f2cd-45e6-9c67-185c5055c7e0" // Debian 12 (Bookworm) x86_64 } // create the server in the third project (backup) resource "stackit_volume" "example_vol_p3" { - project_id = module.project.project_info["project3"].project_id + project_id = module.project.project_info["backup"].project_id name = "root_volume" availability_zone = var.region_az1 size = 200 @@ -44,7 +44,7 @@ resource "stackit_volume" "example_vol_p3" { } resource "stackit_server" "dev_server_p3" { - project_id = module.project.project_info["project3"].project_id + project_id = module.project.project_info["backup"].project_id name = "server2" boot_volume = { source_type = "volume" @@ -60,7 +60,7 @@ resource "stackit_server" "dev_server_p3" { // create the server in the sixth project (infra) resource "stackit_volume" "example_vol_p6" { - project_id = module.project.project_info["project6"].project_id + project_id = module.project.project_info["infra"].project_id name = "root_volume" availability_zone = var.region_az1 size = 200 @@ -72,7 +72,7 @@ resource "stackit_volume" "example_vol_p6" { } resource "stackit_server" "dev_server_p6" { - project_id = module.project.project_info["project6"].project_id + project_id = module.project.project_info["infra"].project_id name = "linux-beta" boot_volume = { source_type = "volume" diff --git a/06-security-group.tf b/06-security-group.tf index 1fead53..ec0ea0f 100644 --- a/06-security-group.tf +++ b/06-security-group.tf @@ -1,7 +1,7 @@ // Security Group and Security Group Rules resource "stackit_security_group" "example" { - project_id = module.project.project_info["project2"].project_id + project_id = module.project.project_info["core"].project_id name = "test" labels = { "key" = "example" @@ -10,7 +10,7 @@ resource "stackit_security_group" "example" { resource "stackit_security_group_rule" "icmp_ingress" { security_group_id = stackit_security_group.example.security_group_id - project_id = module.project.project_info["project2"].project_id + project_id = module.project.project_info["core"].project_id direction = "ingress" icmp_parameters = { code = 0 @@ -21,7 +21,7 @@ resource "stackit_security_group_rule" "icmp_ingress" { } } resource "stackit_security_group_rule" "icmp_egress" { - project_id = module.project.project_info["project2"].project_id + project_id = module.project.project_info["core"].project_id security_group_id = stackit_security_group.example.security_group_id direction = "egress" icmp_parameters = { @@ -35,7 +35,7 @@ resource "stackit_security_group_rule" "icmp_egress" { resource "stackit_security_group_rule" "ssh_ingress" { security_group_id = stackit_security_group.example.security_group_id - project_id = module.project.project_info["project2"].project_id + project_id = module.project.project_info["core"].project_id direction = "ingress" protocol = { @@ -51,7 +51,7 @@ resource "stackit_security_group_rule" "ssh_ingress" { // Security Group and Security Group Rules resource "stackit_security_group" "example_beta" { - project_id = module.project.project_info["project6"].project_id + project_id = module.project.project_info["infra"].project_id name = "test" labels = { "key" = "example" @@ -60,7 +60,7 @@ resource "stackit_security_group" "example_beta" { resource "stackit_security_group_rule" "icmp_ingress_beta" { security_group_id = stackit_security_group.example_beta.security_group_id - project_id = module.project.project_info["project6"].project_id + project_id = module.project.project_info["infra"].project_id direction = "ingress" icmp_parameters = { code = 0 @@ -71,7 +71,7 @@ resource "stackit_security_group_rule" "icmp_ingress_beta" { } } resource "stackit_security_group_rule" "icmp_egress_beta" { - project_id = module.project.project_info["project6"].project_id + project_id = module.project.project_info["infra"].project_id security_group_id = stackit_security_group.example_beta.security_group_id direction = "egress" icmp_parameters = { @@ -85,7 +85,7 @@ resource "stackit_security_group_rule" "icmp_egress_beta" { resource "stackit_security_group_rule" "ssh_ingress_beta" { security_group_id = stackit_security_group.example_beta.security_group_id - project_id = module.project.project_info["project6"].project_id + project_id = module.project.project_info["infra"].project_id direction = "ingress" protocol = { diff --git a/07-object-storage.tf b/07-object-storage.tf index ba43883..2ef66de 100644 --- a/07-object-storage.tf +++ b/07-object-storage.tf @@ -1,16 +1,16 @@ resource "stackit_objectstorage_bucket" "example" { - project_id = module.project.project_info["project3"].project_id + project_id = module.project.project_info["backup"].project_id name = "073a0ea0-9282-4ed6-8990-d5c4bff7cc3f" } resource "stackit_objectstorage_credentials_group" "example" { - project_id = module.project.project_info["project3"].project_id + project_id = module.project.project_info["backup"].project_id name = "example-credentials-group" depends_on = [ stackit_objectstorage_bucket.example ] } resource "stackit_objectstorage_credential" "example" { - project_id = module.project.project_info["project3"].project_id + project_id = module.project.project_info["backup"].project_id credentials_group_id = stackit_objectstorage_credentials_group.example.credentials_group_id expiration_timestamp = "2028-01-02T03:04:05Z" depends_on = [ stackit_objectstorage_credentials_group.example ] diff --git a/08-ske.tf b/08-ske.tf index df82afc..ba1f917 100644 --- a/08-ske.tf +++ b/08-ske.tf @@ -1,5 +1,5 @@ resource "stackit_ske_cluster" "demo-cluster" { - project_id = module.project.project_info["project4"].project_id + project_id = module.project.project_info["ske"].project_id name = "demo-clustr" node_pools = [ { @@ -34,7 +34,7 @@ output "ske-egress-ip" { } resource "stackit_network" "ske_network" { - project_id = module.project.project_info["project4"].project_id + project_id = module.project.project_info["ske"].project_id name = "ske_network" ipv4_nameservers = ["1.1.1.1", "9.9.9.9"] ipv4_prefix = "10.220.10.0/24" diff --git a/modules/project/02-project.tf b/modules/project/02-project.tf index 7804315..73a0d92 100644 --- a/modules/project/02-project.tf +++ b/modules/project/02-project.tf @@ -6,19 +6,19 @@ variable "projects_alpha" { owner_email = string })) default = { - project1 = { + landingzone = { name = "landingzone" owner_email = "michael.sodan@stackit.cloud" } - project2 = { + core = { name = "core" owner_email = "michael.sodan@stackit.cloud" } - project3 = { + backup = { name = "backup" owner_email = "michael.sodan@stackit.cloud" } - project4 = { + ske = { name = "ske" owner_email = "markus.brunsch@stackit.cloud" } @@ -31,11 +31,11 @@ variable "projects_beta" { owner_email = string })) default = { - project5 = { + vpn = { name = "vpn" owner_email = "michael.sodan@stackit.cloud" } - project6 = { + infra = { name = "infra" owner_email = "michael.sodan@stackit.cloud" }